x86: Add reserve_ebda_region to x86_init_ops

reserve_ebda_region needs to be called befor start_kernel. Moorestown
needs to override it. Make it a x86_init_ops function and initialize
it with the default reserve_ebda_region.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index d0d9be25ed937f1d567411b46cc4c47c416bb90b..8a971cb3dd3f5eef9fcddc537cbf34ce6cb05953 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -6,11 +6,13 @@
  * @probe_roms:                        probe BIOS roms
  * @reserve_resources:         reserve the standard resources for the
  *                             platform
+ * @reserve_ebda_region:       reserve the extended bios data area
  *
  */
 struct x86_init_resources {
        void (*probe_roms)(void);
        void (*reserve_resources)(void);
+       void (*reserve_ebda_region)(void);
 };
 
 /**

diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index d91c37c02069af08801b458ef80d21dabc3a83be..921a23b6c145083a49d46a5fc90f048e94e0683d 100644 (file)
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -11,7 +11,7 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/e820.h>
-#include <asm/bios_ebda.h>
+#include <asm/page.h>
 #include <asm/trampoline.h>
 
 void __init i386_start_kernel(void)
@@ -33,7 +33,7 @@ void __init i386_start_kernel(void)
        x86_init.resources.probe_roms = probe_roms;
        x86_init.resources.reserve_resources = i386_reserve_resources;
 
-       reserve_ebda_region();
+       x86_init.resources.reserve_ebda_region();
 
        /*
         * At this point everything still needed from the boot loader

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 70eaa852c732a2db3ae5c809f56f27b9c0f42dc1..cead8149c3deafe6eb9db8e4afefc12ada61ced9 100644 (file)
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -23,7 +23,6 @@
 #include <asm/sections.h>
 #include <asm/kdebug.h>
 #include <asm/e820.h>
-#include <asm/bios_ebda.h>
 #include <asm/trampoline.h>
 
 static void __init zap_identity_mappings(void)
@@ -112,7 +111,7 @@ void __init x86_64_start_reservations(char *real_mode_data)
        }
 #endif
 
-       reserve_ebda_region();
+       x86_init.resources.reserve_ebda_region();
 
        /*
         * At this point everything still needed from the boot loader

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 68c093b67ecfc54a3cb3d3f4a9793b224aa37276..1fff49a6858cb8a5fa939f49b06e0b86576f2e48 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -5,6 +5,7 @@
  */
 #include <linux/init.h>
 
+#include <asm/bios_ebda.h>
 #include <asm/setup.h>
 
 void __cpuinit x86_init_noop(void) { }
@@ -18,5 +19,6 @@ struct __initdata x86_init_ops x86_init = {
        .resources = {
                .probe_roms             = x86_init_noop,
                .reserve_resources      = reserve_standard_io_resources,
+               .reserve_ebda_region    = reserve_ebda_region,
        },
 };