projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
x86_init.c
diff --git
a/arch/x86/kernel/x86_init.c
b/arch/x86/kernel/x86_init.c
index 1bef687faf2278dad2042e42004df305a6c6ad0e..18a799c8fa28b0eac90b3505fae50559d70250df 100644
(file)
--- a/
arch/x86/kernel/x86_init.c
+++ b/
arch/x86/kernel/x86_init.c
@@
-95,6
+95,7
@@
struct x86_init_ops x86_init __initdata = {
},
.acpi = {
+ .set_root_pointer = x86_default_set_root_pointer,
.get_root_pointer = x86_default_get_root_pointer,
.reduced_hw_early_init = acpi_generic_reduced_hw_init,
},