aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-default/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mach-default/setup.c')
-rw-r--r--arch/x86/mach-default/setup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 38a856c4fc07..56b4c39cb7fa 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -153,6 +153,7 @@ late_initcall(print_ipi_mode);
153char * __init machine_specific_memory_setup(void) 153char * __init machine_specific_memory_setup(void)
154{ 154{
155 char *who; 155 char *who;
156 int new_nr;
156 157
157 158
158 who = "BIOS-e820"; 159 who = "BIOS-e820";
@@ -163,9 +164,11 @@ char * __init machine_specific_memory_setup(void)
163 * Otherwise fake a memory map; one section from 0k->640k, 164 * Otherwise fake a memory map; one section from 0k->640k,
164 * the next section from 1mb->appropriate_mem_k 165 * the next section from 1mb->appropriate_mem_k
165 */ 166 */
167 new_nr = boot_params.e820_entries;
166 sanitize_e820_map(boot_params.e820_map, 168 sanitize_e820_map(boot_params.e820_map,
167 ARRAY_SIZE(boot_params.e820_map), 169 ARRAY_SIZE(boot_params.e820_map),
168 &boot_params.e820_entries); 170 &new_nr);
171 boot_params.e820_entries = new_nr;
169 if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries) 172 if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
170 < 0) { 173 < 0) {
171 unsigned long mem_size; 174 unsigned long mem_size;