Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751113AbeAPBZU (ORCPT + 1 other); Mon, 15 Jan 2018 20:25:20 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:38354 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750786AbeAPBZS (ORCPT ); Mon, 15 Jan 2018 20:25:18 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35346528" Subject: Re: [PATCH] x86/jailhouse: fix building without X86_X2APIC To: Arnd Bergmann , Jan Kiszka , Thomas Gleixner , CC: , Ingo Molnar , "H. Peter Anvin" , Juergen Gross , References: <20180115202335.1645883-1-arnd@arndb.de> From: Dou Liyang Message-ID: Date: Tue, 16 Jan 2018 09:25:04 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180115202335.1645883-1-arnd@arndb.de> Content-Type: text/plain; charset="gbk"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: 801BC48AE82D.AB2F6 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Hi Arnd, At 01/16/2018 04:23 AM, Arnd Bergmann wrote: > When CONFIG_X86_X2APIC is disabled, jailhouse fails to build: > > arch/x86/kernel/jailhouse.c: In function 'jailhouse_get_smp_config': > arch/x86/kernel/jailhouse.c:73:3: error: 'x2apic_phys' undeclared (first use in this function); did you mean 'x2apic_mode'? > > The code is protected by an appropriate x2apic_enabled() check that leads > to the assignment being optimized out without a link-time reference to > x2apic_phys, so we just lack a declaration. > > Let's move x2apic_mode and x2apic_phys outside of the #ifdef together, > for consistency. > > Fixes: 11c8dc419bbc ("x86/jailhouse: Enable APIC and SMP support") > Signed-off-by: Arnd Bergmann > --- > arch/x86/include/asm/apic.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h > index 98722773391d..0317d635d9ba 100644 > --- a/arch/x86/include/asm/apic.h > +++ b/arch/x86/include/asm/apic.h > @@ -188,6 +188,8 @@ static inline void lapic_assign_system_vectors(void) { } > static inline void lapic_assign_legacy_vector(unsigned int i, bool r) { } > #endif /* !CONFIG_X86_LOCAL_APIC */ > > +extern int x2apic_mode; > +extern int x2apic_phys; We can't do that, adding a macro for the X2APIC=n case is enough Thanks, dou -------------------------8<---------------------- Subject: [PATCH] x86/apic: Add a macro named x2apic_phys for the X2APIC=n case The x86 system may build failed in the X2APIC=n case, due to the missing of x2apic_phys. So add a macro named x2apic_phys for the X2APIC=n case. Signed-off-by: Dou Liyang --- arch/x86/include/asm/apic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index a9e57f08bfa6..ca5940fb995a 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -264,7 +264,8 @@ static inline void x2apic_setup(void) { } static inline int x2apic_enabled(void) { return 0; } #define x2apic_mode (0) -#define x2apic_supported() (0) +#define x2apic_phys (0) +#define x2apic_supported() (0) #endif /* !CONFIG_X86_X2APIC */ struct irq_data; --