On Tue, Aug 04, 2009 at 03:37:15PM +0200, Ingo Molnar wrote:
>
> * tip-bot for Gleb Natapov <gleb@xxxxxxxxxx> wrote:
>
> > Commit-ID: ee6a28296de295d62a3d8fad8bab58a8a48d006f
> > Gitweb: http://git.kernel.org/tip/ee6a28296de295d62a3d8fad8bab58a8a48d006f
> > Author: Gleb Natapov <gleb@xxxxxxxxxx>
> > AuthorDate: Mon, 20 Jul 2009 15:24:17 +0300
> > Committer: Ingo Molnar <mingo@xxxxxxx>
> > CommitDate: Tue, 4 Aug 2009 14:44:10 +0200
> >
> > x86/apic: Enable x2APIC without interrupt remapping under KVM
>
> -tip testing found this build failure:
>
> arch/x86/kernel/apic/apic.c: In function ‘enable_IR_x2apic’:
> arch/x86/kernel/apic/apic.c:1431: error: ‘x2apic_phys’ undeclared (first use in this function)
> arch/x86/kernel/apic/apic.c:1431: error: (Each undeclared identifier is reported only once
> arch/x86/kernel/apic/apic.c:1431: error: for each function it appears in.)
>
> with the attached config. (Please send a delta fix)
>
> Ingo
Signed-off-by: Gleb Natapov <gleb@xxxxxxxxxx>
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index bb7d479..ebdbf54 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -183,6 +183,10 @@ static inline int x2apic_enabled(void)
}
#define x2apic_supported() (cpu_has_x2apic)
+static inline void x2apic_force_phys(void)
+{
+ x2apic_phys = 1;
+}
#else
static inline void check_x2apic(void)
{
@@ -194,6 +198,9 @@ static inline int x2apic_enabled(void)
{
return 0;
}
+static inline void x2apic_force_phys()
+{
+}
#define x2apic_preenabled 0
#define x2apic_supported() 0
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 1221f68..de039fc 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1428,7 +1428,7 @@ void __init enable_IR_x2apic(void)
* without IR all CPUs can be addressed by IOAPIC/MSI
* only in physical mode
*/
- x2apic_phys = 1;
+ x2apic_force_phys();
}
x2apic_enabled = 1;
--
Gleb.
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|