x86: use WARN() in arch/x86/mm/ioremap.c

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / head.c

diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c
index a727c0b9819c563cbba55232dcc4aab5fbdaa133..3e66bd364a9db3cf8f3fb624f96eeb7075364d78 100644 (file)
--- a/arch/x86/kernel/head.c
+++ b/arch/x86/kernel/head.c
@@ -51,23 +51,5 @@ void __init reserve_ebda_region(void)
                lowmem = 0x9f000;
 
        /* reserve all memory between lowmem and the 1MB mark */
-       reserve_early(lowmem, 0x100000, "BIOS reserved");
-}
-
-void __init reserve_setup_data(void)
-{
-       struct setup_data *data;
-       u64 pa_data;
-       char buf[32];
-
-       if (boot_params.hdr.version < 0x0209)
-               return;
-       pa_data = boot_params.hdr.setup_data;
-       while (pa_data) {
-               data = early_ioremap(pa_data, sizeof(*data));
-               sprintf(buf, "setup data %x", data->type);
-               reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf);
-               pa_data = data->next;
-               early_iounmap(data, sizeof(*data));
-       }
+       reserve_early_overlap_ok(lowmem, 0x100000, "BIOS reserved");
 }