diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:27:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:27:39 +0100 |
| commit | 160d8dac12932ad6eb4a359b66521e2e3282ea7d (patch) | |
| tree | 57aa576736c95c297fd340c169f614496e42cfad | |
| parent | Merge branch 'x86/apic' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/apic (diff) | |
| download | linux-dev-160d8dac12932ad6eb4a359b66521e2e3282ea7d.tar.xz linux-dev-160d8dac12932ad6eb4a359b66521e2e3282ea7d.zip | |
x86, apic: make generic_apic_probe() generally available
Impact: build fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/include/asm/apic.h | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index f4835a1be360..fba49f66228f 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -33,7 +33,13 @@ } while (0) +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) extern void generic_apic_probe(void); +#else +static inline void generic_apic_probe(void) +{ +} +#endif #ifdef CONFIG_X86_LOCAL_APIC diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 150e6d0a3b47..8fce6c714514 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -936,9 +936,7 @@ void __init setup_arch(char **cmdline_p) map_vsyscall(); #endif -#ifdef CONFIG_X86_32 generic_apic_probe(); -#endif early_quirks(); |