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/include/asm/x86_init.h | |
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/include/asm/x86_init.h')
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 20df51871713..b6c89428137d 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _ASM_X86_PLATFORM_H | 2 | #define _ASM_X86_PLATFORM_H |
3 | 3 | ||
4 | #include <asm/pgtable_types.h> | 4 | #include <asm/pgtable_types.h> |
5 | #include <asm/bootparam.h> | ||
5 | 6 | ||
6 | struct mpc_bus; | 7 | struct mpc_bus; |
7 | struct mpc_cpu; | 8 | struct mpc_cpu; |
@@ -34,14 +35,12 @@ struct x86_init_mpparse { | |||
34 | * @probe_roms: probe BIOS roms | 35 | * @probe_roms: probe BIOS roms |
35 | * @reserve_resources: reserve the standard resources for the | 36 | * @reserve_resources: reserve the standard resources for the |
36 | * platform | 37 | * platform |
37 | * @reserve_ebda_region: reserve the extended bios data area | ||
38 | * @memory_setup: platform specific memory setup | 38 | * @memory_setup: platform specific memory setup |
39 | * | 39 | * |
40 | */ | 40 | */ |
41 | struct x86_init_resources { | 41 | struct x86_init_resources { |
42 | void (*probe_roms)(void); | 42 | void (*probe_roms)(void); |
43 | void (*reserve_resources)(void); | 43 | void (*reserve_resources)(void); |
44 | void (*reserve_ebda_region)(void); | ||
45 | char *(*memory_setup)(void); | 44 | char *(*memory_setup)(void); |
46 | }; | 45 | }; |
47 | 46 | ||