| commit | d5b5a232b2f2b6e64762308e90d47248dddfd72f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Feb 11 10:49:40 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Feb 11 10:49:40 2009 +0100 |
| tree | 968c0568b62d6eeeec22a2ca07f1be6de07c437d | |
| parent | 0e81cb59c7120191c0243c686b591797bc79e5c6 [diff] | |
| parent | bf56957d176c279175464f385f3eb03d65819328 [diff] |
Merge branch 'x86/apic' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/apic
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 8d8fa99..150e6d0 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -936,7 +936,7 @@ map_vsyscall(); #endif -#if defined(CONFIG_X86_32_NON_STANDARD) || defined(CONFIG_X86_BIGSMP) +#ifdef CONFIG_X86_32 generic_apic_probe(); #endif