x86: add X86_RESERVE_LOW_64K

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

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 33719544a2244f477fb669f2eb32ec006735e809..786c1886ae5365aded249565726f6e366efaac8b 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -735,13 +735,14 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
                "%s detected: BIOS may corrupt low RAM, working it around.\n",
                d->ident);
 
-       reserve_early(0x0, 0x10000, "BIOS quirk");
+       reserve_early_overlap_ok(0x0, 0x10000, "BIOS quirk");
 
        return 0;
 }
 
 /* List of systems that have known low memory corruption BIOS problems */
 static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
+#ifdef CONFIG_X86_RESERVE_LOW_64K
        {
                .callback = dmi_low_memory_corruption,
                .ident = "AMI BIOS",
@@ -757,6 +758,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
                },
        },
        {}
+#endif
 };
 
 /*