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>

5 files changed, 5 insertions, 26 deletions

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index ca96e68f0d23..403c062f69e8 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -260,7 +260,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
         .arch_pre_time_init             = numaq_pre_time_init,
         .arch_time_init                 = NULL,
         .arch_pre_intr_init             = NULL,
-        .arch_memory_setup              = NULL,
         .arch_intr_init                 = NULL,
         .arch_trap_init                 = NULL,
         .mach_get_smp_config            = NULL,
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 5cb5725b2bae..0d804b907e80 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1455,28 +1455,11 @@ char *__init default_machine_specific_memory_setup(void)
         return who;
 }
 
-char *__init __attribute__((weak)) machine_specific_memory_setup(void)
-{
-        if (x86_quirks->arch_memory_setup) {
-                char *who = x86_quirks->arch_memory_setup();
-
-                if (who)
-                        return who;
-        }
-        return default_machine_specific_memory_setup();
-}
-
-/* Overridden in paravirt.c if CONFIG_PARAVIRT */
-char * __init __attribute__((weak)) memory_setup(void)
-{
-        return machine_specific_memory_setup();
-}
-
 void __init setup_memory_map(void)
 {
         char *who;
 
-        who = memory_setup();
+        who = x86_init.resources.memory_setup();
         memcpy(&e820_saved, &e820, sizeof(struct e820map));
         printk(KERN_INFO "BIOS-provided physical RAM map:\n");
         e820_print_map(who);
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 70ec9b951d76..532c9a2626c7 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -60,11 +60,6 @@ static void __init default_banner(void)
                pv_info.name);
 }
 
-char *memory_setup(void)
-{
-        return pv_init_ops.memory_setup();
-}
-
 /* Simple instruction patching code. */
 #define DEF_NATIVE(ops, name, code)                                     \
         extern const char start_##ops##_##name[], end_##ops##_##name[]; \
@@ -322,7 +317,6 @@ struct pv_init_ops pv_init_ops = {
         .patch = native_patch,
         .banner = default_banner,
         .arch_setup = paravirt_nop,
-        .memory_setup = machine_specific_memory_setup,
 };
 
 struct pv_time_ops pv_time_ops = {
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 31ffc24eec4d..97c670df1aed 100644
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -239,7 +239,6 @@ static int visws_trap_init(void);
 static struct x86_quirks visws_x86_quirks __initdata = {
         .arch_time_init         = visws_time_init,
         .arch_pre_intr_init     = visws_pre_intr_init,
-        .arch_memory_setup      = visws_memory_setup,
         .arch_intr_init         = NULL,
         .arch_trap_init         = visws_trap_init,
         .mach_get_smp_config    = visws_get_smp_config,
@@ -263,6 +262,8 @@ void __init visws_early_detect(void)
          */
         x86_quirks = &visws_x86_quirks;
 
+        x86_init.resources.memory_setup = visws_memory_setup;
+
         /*
          * Install reboot quirks:
          */
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 1fff49a6858c..1965bff3489c 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 @@ struct __initdata x86_init_ops x86_init = {
                 .probe_roms             = x86_init_noop,
                 .reserve_resources      = reserve_standard_io_resources,
                 .reserve_ebda_region    = reserve_ebda_region,
+                .memory_setup           = default_machine_specific_memory_setup,
         },
 };