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

Commit 18a01a3b authored by Bernhard Walle's avatar Bernhard Walle Committed by Linus Torvalds
Browse files

Use BOOTMEM_EXCLUSIVE for kdump 



Use the BOOTMEM_EXCLUSIVE, introduced in the previous patch, to avoid
conflicts while reserving the memory for the kdump capture kernel
(crashkernel=).

Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Cc: <linux-arch@vger.kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 72a7fe39

arch/sh/kernel/setup.c

+18 −11
Original line number Diff line number Diff line
@@ -140,7 +140,19 @@ static void __init reserve_crashkernel(void) 
	ret = parse_crashkernel(boot_command_line, free_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size) {

		if (crash_base > 0) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

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

			return;

		}



		if (reserve_bootmem(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),
@@ -148,11 +160,6 @@ static void __init reserve_crashkernel(void) 
				(unsigned long)(free_mem >> 20));

		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");

	}

}

#else

arch/x86/kernel/setup_64.c

+21 −15
Original line number Diff line number Diff line
@@ -220,29 +220,35 @@ static inline void copy_edd(void) 
#ifdef CONFIG_KEXEC

static void __init reserve_crashkernel(void)

{

	unsigned long long free_mem;

	unsigned long long total_mem;

	unsigned long long crash_size, crash_base;

	int ret;



	free_mem =

		((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;

	total_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;



	ret = parse_crashkernel(boot_command_line, free_mem,

	ret = parse_crashkernel(boot_command_line, total_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size) {

		if (crash_base > 0) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

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

			return;

		}



		if (reserve_bootmem(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),

				(unsigned long)(crash_base >> 20),

					(unsigned long)(free_mem >> 20));

				(unsigned long)(total_mem >> 20));

		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");

	}

}

#else