diff options
-rw-r--r-- | arch/x86/kernel/setup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 161f1b33ecec..d29951c11be0 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -735,7 +735,8 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d) | |||
735 | "%s detected: BIOS may corrupt low RAM, working it around.\n", | 735 | "%s detected: BIOS may corrupt low RAM, working it around.\n", |
736 | d->ident); | 736 | d->ident); |
737 | 737 | ||
738 | reserve_early_overlap_ok(0x0, 0x10000, "BIOS quirk"); | 738 | e820_update_range(0, 0x10000, E820_RAM, E820_RESERVED); |
739 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | ||
739 | 740 | ||
740 | return 0; | 741 | return 0; |
741 | } | 742 | } |
@@ -784,8 +785,6 @@ void __init setup_arch(char **cmdline_p) | |||
784 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | 785 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
785 | #endif | 786 | #endif |
786 | 787 | ||
787 | dmi_check_system(bad_bios_dmi_table); | ||
788 | |||
789 | early_cpu_init(); | 788 | early_cpu_init(); |
790 | early_ioremap_init(); | 789 | early_ioremap_init(); |
791 | 790 | ||
@@ -880,6 +879,10 @@ void __init setup_arch(char **cmdline_p) | |||
880 | 879 | ||
881 | finish_e820_parsing(); | 880 | finish_e820_parsing(); |
882 | 881 | ||
882 | dmi_scan_machine(); | ||
883 | |||
884 | dmi_check_system(bad_bios_dmi_table); | ||
885 | |||
883 | #ifdef CONFIG_X86_32 | 886 | #ifdef CONFIG_X86_32 |
884 | probe_roms(); | 887 | probe_roms(); |
885 | #endif | 888 | #endif |
@@ -967,8 +970,6 @@ void __init setup_arch(char **cmdline_p) | |||
967 | vsmp_init(); | 970 | vsmp_init(); |
968 | #endif | 971 | #endif |
969 | 972 | ||
970 | dmi_scan_machine(); | ||
971 | |||
972 | io_delay_init(); | 973 | io_delay_init(); |
973 | 974 | ||
974 | /* | 975 | /* |