Messages in this thread Patch in this message | | | From | Henrik Kretzschmar <> | Subject | [PATCH 2/6] x86: ifdef enable_IR_x2apic() out | Date | Mon, 14 Feb 2011 11:00:08 +0100 |
| |
The only caller of enable_IR_x2apic() is probe_64.c, which is only compiled on x86-64 bit machines. This function causes compilation problems on 32-bit machines with no io-apic enabled, so we remove it from 32s and keep the way it was on 64s.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> --- arch/x86/include/asm/apic.h | 2 ++ arch/x86/kernel/apic/apic.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index b8a3484..b1d77e1 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -216,7 +216,9 @@ static inline void x2apic_force_phys(void) #define x2apic_supported() 0 #endif +#ifdef CONFIG_X86_64 extern void enable_IR_x2apic(void); +#endif extern int get_physical_broadcast(void); diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 306386f..27a7497 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1467,6 +1467,7 @@ int __init enable_IR(void) return 0; } +#ifdef CONFIG_X86_64 void __init enable_IR_x2apic(void) { unsigned long flags; @@ -1540,7 +1541,6 @@ out: pr_info("Not enabling x2apic, Intr-remapping init failed.\n"); } -#ifdef CONFIG_X86_64 /* * Detect and enable local APICs on non-SMP boards. * Original code written by Keir Fraser. -- 1.7.2.3
| |