summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/head64.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-29 15:03:59 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 11:09:40 +0200
commit47a3d5da70f411bc044ecd3c0593b158b09d0efa (patch)
tree30d5204e6d11cd81b20bc3fa582762cd4bdd3135 /arch/x86/kernel/head64.c
parentdd0a70c8f921708eba29ef9f30dde1f14a74af05 (diff)
x86: Add early platform detection
Platforms like Moorestown require early setup and want to avoid the call to reserve_ebda_region. The x86_init override is too late when the MRST detection happens in setup_arch. Move the default i386 x86_init overrides and the call to reserve_ebda_region into a separate function which is called as the default of a switch case depending on the hardware_subarch id in boot params. This allows us to add a case for MRST and let MRST have its own early setup function. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/head64.c')
-rw-r--r--arch/x86/kernel/head64.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index cead8149c3d..0b06cd778fd 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -24,6 +24,7 @@
#include <asm/kdebug.h>
#include <asm/e820.h>
#include <asm/trampoline.h>
+#include <asm/bios_ebda.h>
static void __init zap_identity_mappings(void)
{
@@ -111,7 +112,7 @@ void __init x86_64_start_reservations(char *real_mode_data)
}
#endif
- x86_init.resources.reserve_ebda_region();
+ reserve_ebda_region();
/*
* At this point everything still needed from the boot loader