aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-07 13:19:56 -0400
committerIngo Molnar <mingo@kernel.org>2012-05-07 13:19:56 -0400
commit9438ef7f4ea73d5430a330fc206f97826eb9fb16 (patch)
tree2b962b63d0d1ec650e4e6bcce928a5af5e12f2ac /arch/x86
parent42fa4250436304d4650fa271f37671f6cee24e08 (diff)
x86/apic: Fix UP boot crash
Commit 31b3c9d72340 ("xen/x86: Implement x86_apic_ops") implemented this: ... without considering that on UP the function pointer might be NULL. Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Link: http://lkml.kernel.org/n/tip-3pfty0ml4yp62phbkchichh0@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 8526317c5f0b..7e67c5a71061 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1012,7 +1012,8 @@ void __init setup_arch(char **cmdline_p)
1012 init_cpu_to_node(); 1012 init_cpu_to_node();
1013 1013
1014 init_apic_mappings(); 1014 init_apic_mappings();
1015 x86_io_apic_ops.init(); 1015 if (x86_io_apic_ops.init)
1016 x86_io_apic_ops.init();
1016 1017
1017 kvm_guest_init(); 1018 kvm_guest_init();
1018 1019