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, 0 deletions

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 8a971cb3dd3..6c084f2a6c3 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -7,12 +7,14 @@
  * @reserve_resources:          reserve the standard resources for the
  *                              platform
  * @reserve_ebda_region:        reserve the extended bios data area
+ * @memory_setup:               platform specific memory setup
  *
  */
 struct x86_init_resources {
         void (*probe_roms)(void);
         void (*reserve_resources)(void);
         void (*reserve_ebda_region)(void);
+        char *(*memory_setup)(void);
 };
 
 /**