x86: Move memory_setup to x86_init_ops
memory_setup is overridden by x86_quirks and by paravirts with weak
functions and quirks. Unify the whole mess and make it an
unconditional x86_init_ops function which defaults to the standard
function and can be overridden by the early platform code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 1fff49a..1965bff 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -7,6 +7,7 @@
#include <asm/bios_ebda.h>
#include <asm/setup.h>
+#include <asm/e820.h>
void __cpuinit x86_init_noop(void) { }
@@ -20,5 +21,6 @@
.probe_roms = x86_init_noop,
.reserve_resources = reserve_standard_io_resources,
.reserve_ebda_region = reserve_ebda_region,
+ .memory_setup = default_machine_specific_memory_setup,
},
};