diff options
| author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2015-02-02 22:27:11 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-19 00:30:19 +0300 |
| commit | b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8 (patch) | |
| tree | 5cfee0fc00974ce21f8f646f4ae913811887224d /arch/x86/include/asm/apic.h | |
| parent | 829bf7af647e489caa494cebdb2e4d455ec4644a (diff) | |
| download | linux-b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8.tar.xz | |
x86/apic: Fix the devicetree build in certain configs
Without this patch:
LD init/built-in.o
arch/x86/built-in.o: In function `dtb_lapic_setup': kernel/devicetree.c:155:
undefined reference to `apic_force_enable'
Makefile:923: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Reviewed-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Jan Beulich <JBeulich@suse.com>
Link: http://lkml.kernel.org/r/1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 92003f3c8a42..efc3b22d896e 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -213,7 +213,15 @@ void register_lapic_address(unsigned long address); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern int APIC_init_uniprocessor(void); + +#ifdef CONFIG_X86_64 +static inline int apic_force_enable(unsigned long addr) +{ + return -1; +} +#else extern int apic_force_enable(unsigned long addr); +#endif extern int apic_bsp_setup(bool upmode); extern void apic_ap_setup(void); |