Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3942cff authored by Bernhard Walle's avatar Bernhard Walle Committed by Ingo Molnar
Browse files

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: default avatarBernhard Walle <bwalle@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: <stable@kernel.org>
parent df17b1d9

arch/x86/kernel/setup_32.c

+8 −2
Original line number Diff line number Diff line
@@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void) 
					(unsigned long)(crash_size >> 20),

					(unsigned long)(crash_base >> 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.end   = crash_base + crash_size - 1;

			reserve_bootmem(crash_base, crash_size,

					BOOTMEM_DEFAULT);

		} else

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");