x86: use BOOTMEM_EXCLUSIVE on 32-bit
This patch uses the BOOTMEM_EXCLUSIVE for crashkernel reservation also for i386 and prints a error message on failure. The patch is still for 2.6.26 since it is only bug fixing. The unification of reserve_crashkernel() between i386 and x86_64 should be done for 2.6.27. Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: <stable@kernel.org>
This commit is contained in:
Родитель
df17b1d990
Коммит
d3942cff62
|
@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void)
|
||||||
(unsigned long)(crash_size >> 20),
|
(unsigned long)(crash_size >> 20),
|
||||||
(unsigned long)(crash_base >> 20),
|
(unsigned long)(crash_base >> 20),
|
||||||
(unsigned long)(total_mem >> 20));
|
(unsigned long)(total_mem >> 20));
|
||||||
|
|
||||||
|
if (reserve_bootmem(crash_base, crash_size,
|
||||||
|
BOOTMEM_EXCLUSIVE) < 0) {
|
||||||
|
printk(KERN_INFO "crashkernel reservation "
|
||||||
|
"failed - memory is in use\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
crashk_res.start = crash_base;
|
crashk_res.start = crash_base;
|
||||||
crashk_res.end = crash_base + crash_size - 1;
|
crashk_res.end = crash_base + crash_size - 1;
|
||||||
reserve_bootmem(crash_base, crash_size,
|
|
||||||
BOOTMEM_DEFAULT);
|
|
||||||
} else
|
} else
|
||||||
printk(KERN_INFO "crashkernel reservation failed - "
|
printk(KERN_INFO "crashkernel reservation failed - "
|
||||||
"you have to specify a base address\n");
|
"you have to specify a base address\n");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче