projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42fa425
)
x86/apic: Fix UP boot crash
author
Ingo Molnar
<mingo@kernel.org>
Mon, 7 May 2012 17:19:56 +0000
(19:19 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 7 May 2012 17:19:56 +0000
(19:19 +0200)
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>
arch/x86/kernel/setup.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index 8526317c5f0b2689bff11e6d0a9f569f369e6344..7e67c5a71061eb7389dcf8ea7526028f4eb7619f 100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-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();