diff options
Diffstat (limited to 'arch/x86/kernel/head32.c')
-rw-r--r-- | arch/x86/kernel/head32.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index a21398fac4fa..441c075e2b80 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c | |||
@@ -15,6 +15,17 @@ | |||
15 | #include <asm/trampoline.h> | 15 | #include <asm/trampoline.h> |
16 | #include <asm/apic.h> | 16 | #include <asm/apic.h> |
17 | #include <asm/io_apic.h> | 17 | #include <asm/io_apic.h> |
18 | #include <asm/bios_ebda.h> | ||
19 | |||
20 | static void __init i386_default_early_setup(void) | ||
21 | { | ||
22 | /* Initilize 32bit specific setup functions */ | ||
23 | x86_init.resources.probe_roms = probe_roms; | ||
24 | x86_init.resources.reserve_resources = i386_reserve_resources; | ||
25 | x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc; | ||
26 | |||
27 | reserve_ebda_region(); | ||
28 | } | ||
18 | 29 | ||
19 | void __init i386_start_kernel(void) | 30 | void __init i386_start_kernel(void) |
20 | { | 31 | { |
@@ -31,12 +42,13 @@ void __init i386_start_kernel(void) | |||
31 | reserve_early(ramdisk_image, ramdisk_end, "RAMDISK"); | 42 | reserve_early(ramdisk_image, ramdisk_end, "RAMDISK"); |
32 | } | 43 | } |
33 | #endif | 44 | #endif |
34 | /* Initilize 32bit specific setup functions */ | ||
35 | x86_init.resources.probe_roms = probe_roms; | ||
36 | x86_init.resources.reserve_resources = i386_reserve_resources; | ||
37 | x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc; | ||
38 | 45 | ||
39 | x86_init.resources.reserve_ebda_region(); | 46 | /* Call the subarch specific early setup function */ |
47 | switch (boot_params.hdr.hardware_subarch) { | ||
48 | default: | ||
49 | i386_default_early_setup(); | ||
50 | break; | ||
51 | } | ||
40 | 52 | ||
41 | /* | 53 | /* |
42 | * At this point everything still needed from the boot loader | 54 | * At this point everything still needed from the boot loader |