[patch 05/49] x86: fix CONFIG_X86_RESERVE_LOW_64K=y

Greg KH
2008-11-12T00:28:06Z

[-- Attachment #1: x86-fix-config_x86_reserve_low_64k-y.patch --]
[-- Type: text/plain, Size: 1677 bytes --]

2.6.27-stable review patch. If anyone has any objections, please let us know.

------------------

From: Yinghai Lu <yhlu.kernel@gmail.com>

commit 2216d199b1430d1c0affb1498a9ebdbd9c0de439 upstream

The bad_bios_dmi_table() quirk never triggered because we do DMI setup
too late. Move it a bit earlier.

Also change the CONFIG_X86_RESERVE_LOW_64K quirk to operate on the e820
table directly instead of messing with early reservations - this handles
overlaps (which do occur in this low range of RAM) more gracefully.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
arch/x86/kernel/setup.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -584,7 +584,8 @@ static int __init dmi_low_memory_corrupt
"%s detected: BIOS may corrupt low RAM, working it around.\n",
d->ident);

- reserve_early_overlap_ok(0x0, 0x10000, "BIOS quirk");
+ e820_update_range(0, 0x10000, E820_RAM, E820_RESERVED);
+ sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

return 0;
}
@@ -633,8 +634,6 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_INFO "Command line: %s\n", boot_command_line);
#endif

- dmi_check_system(bad_bios_dmi_table);
-
early_cpu_init();
early_ioremap_init();

@@ -733,6 +732,10 @@ void __init setup_arch(char **cmdline_p)

finish_e820_parsing();

+ dmi_scan_machine();
+
+ dmi_check_system(bad_bios_dmi_table);
+
#ifdef CONFIG_X86_32
probe_roms();
#endif
@@ -815,8 +818,6 @@ void __init setup_arch(char **cmdline_p)
vsmp_init();
#endif

- dmi_scan_machine();
-
io_delay_init();

/*

--