diff options
| author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2009-01-11 20:34:47 +0530 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-12 19:24:23 +0100 |
| commit | 2bc1379712e74c5b99adaa6db433c14d8841ab4f (patch) | |
| tree | 680195c9f685e31e4aa6b063234d95db26e224c9 /arch | |
| parent | 4884d8e6a05026ec906355436cea9dc1acb1d09e (diff) | |
| download | linux-3.10-2bc1379712e74c5b99adaa6db433c14d8841ab4f.tar.gz linux-3.10-2bc1379712e74c5b99adaa6db433c14d8841ab4f.tar.bz2 linux-3.10-2bc1379712e74c5b99adaa6db433c14d8841ab4f.zip | |
x86: fix apic.c build error on latest git
Fix this by reintroducing asm/smp.h include in apic.c - later on
I will fix this by removing non-smp data from smp.h
Also fix the __inquire_remote_apic() prototype/inline.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_wakecpu.h | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/apic.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h index ceb01366014..89897a6a65b 100644 --- a/arch/x86/include/asm/mach-default/mach_wakecpu.h +++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h @@ -24,7 +24,13 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) { } +#ifdef CONFIG_SMP extern void __inquire_remote_apic(int apicid); +#else /* CONFIG_SMP */ +static inline void __inquire_remote_apic(int apicid) +{ +} +#endif /* CONFIG_SMP */ static inline void inquire_remote_apic(int apicid) { diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 566a08466b1..0f830e4f567 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -47,6 +47,7 @@ #include <asm/proto.h> #include <asm/apic.h> #include <asm/i8259.h> +#include <asm/smp.h> #include <mach_apic.h> #include <mach_apicdef.h> |