diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 09:03:59 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 05:09:40 -0400 |
commit | 47a3d5da70f411bc044ecd3c0593b158b09d0efa (patch) | |
tree | 30d5204e6d11cd81b20bc3fa582762cd4bdd3135 /arch/x86/kernel/head64.c | |
parent | dd0a70c8f921708eba29ef9f30dde1f14a74af05 (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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index cead8149c3de..0b06cd778fd9 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <asm/kdebug.h> | 24 | #include <asm/kdebug.h> |
25 | #include <asm/e820.h> | 25 | #include <asm/e820.h> |
26 | #include <asm/trampoline.h> | 26 | #include <asm/trampoline.h> |
27 | #include <asm/bios_ebda.h> | ||
27 | 28 | ||
28 | static void __init zap_identity_mappings(void) | 29 | static void __init zap_identity_mappings(void) |
29 | { | 30 | { |
@@ -111,7 +112,7 @@ void __init x86_64_start_reservations(char *real_mode_data) | |||
111 | } | 112 | } |
112 | #endif | 113 | #endif |
113 | 114 | ||
114 | x86_init.resources.reserve_ebda_region(); | 115 | reserve_ebda_region(); |
115 | 116 | ||
116 | /* | 117 | /* |
117 | * At this point everything still needed from the boot loader | 118 | * At this point everything still needed from the boot loader |