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>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 31ffc24eec4..97c670df1ae 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:
          */