Skip to content

Commit

Permalink
x86/apic: Fix UP boot crash
Browse files Browse the repository at this point in the history
Commit 31b3c9d ("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>
  • Loading branch information
Ingo Molnar committed May 7, 2012
1 parent 42fa425 commit 9438ef7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,8 @@ void __init setup_arch(char **cmdline_p)
init_cpu_to_node();

init_apic_mappings();
x86_io_apic_ops.init();
if (x86_io_apic_ops.init)
x86_io_apic_ops.init();

kvm_guest_init();

Expand Down

0 comments on commit 9438ef7

Please sign in to comment.