memblock: Kill memblock_init()
[linux-2.6.git] / arch / x86 / kernel / head32.c
index a21398f..51ff186 100644 (file)
@@ -7,6 +7,8 @@
 
 #include <linux/init.h>
 #include <linux/start_kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
 
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/trampoline.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
+#include <asm/bios_ebda.h>
+#include <asm/tlbflush.h>
 
-void __init i386_start_kernel(void)
+static void __init i386_default_early_setup(void)
 {
-       reserve_trampoline_memory();
+       /* Initialize 32bit specific setup functions */
+       x86_init.resources.reserve_resources = i386_reserve_resources;
+       x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
+
+       reserve_ebda_region();
+}
 
-       reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
+void __init i386_start_kernel(void)
+{
+       memblock_reserve(__pa_symbol(&_text),
+                        __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
 
 #ifdef CONFIG_BLK_DEV_INITRD
        /* Reserve INITRD */
        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
+               /* Assume only end is not page aligned */
                u64 ramdisk_image = boot_params.hdr.ramdisk_image;
                u64 ramdisk_size  = boot_params.hdr.ramdisk_size;
-               u64 ramdisk_end   = ramdisk_image + ramdisk_size;
-               reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");
+               u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);
+               memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image);
        }
 #endif
-       /* Initilize 32bit specific setup functions */
-       x86_init.resources.probe_roms = probe_roms;
-       x86_init.resources.reserve_resources = i386_reserve_resources;
-       x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
 
-       x86_init.resources.reserve_ebda_region();
+       /* Call the subarch specific early setup function */
+       switch (boot_params.hdr.hardware_subarch) {
+       case X86_SUBARCH_MRST:
+               x86_mrst_early_setup();
+               break;
+       case X86_SUBARCH_CE4100:
+               x86_ce4100_early_setup();
+               break;
+       default:
+               i386_default_early_setup();
+               break;
+       }
 
        /*
         * At this point everything still needed from the boot loader