aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r--arch/x86/kernel/setup_64.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index c8939dfddfba..8345c3b12f05 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -189,7 +189,7 @@ contig_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
189 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); 189 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);
190 e820_register_active_regions(0, start_pfn, end_pfn); 190 e820_register_active_regions(0, start_pfn, end_pfn);
191 free_bootmem_with_active_regions(0, end_pfn); 191 free_bootmem_with_active_regions(0, end_pfn);
192 reserve_bootmem(bootmap, bootmap_size); 192 reserve_bootmem(bootmap, bootmap_size, BOOTMEM_DEFAULT);
193} 193}
194#endif 194#endif
195 195
@@ -238,7 +238,8 @@ static void __init reserve_crashkernel(void)
238 (unsigned long)(free_mem >> 20)); 238 (unsigned long)(free_mem >> 20));
239 crashk_res.start = crash_base; 239 crashk_res.start = crash_base;
240 crashk_res.end = crash_base + crash_size - 1; 240 crashk_res.end = crash_base + crash_size - 1;
241 reserve_bootmem(crash_base, crash_size); 241 reserve_bootmem(crash_base, crash_size,
242 BOOTMEM_DEFAULT);
242 } else 243 } else
243 printk(KERN_INFO "crashkernel reservation failed - " 244 printk(KERN_INFO "crashkernel reservation failed - "
244 "you have to specify a base address\n"); 245 "you have to specify a base address\n");