Commit 7d7712a3 authored by Bernhard Walle's avatar Bernhard Walle Committed by Linus Torvalds
Browse files

Use extended crashkernel command line on sh 



This patch removes the crashkernel parsing from arch/sh/kernel/machine_kexec.c
and calls the generic function, introduced in the generic patch, in
setup_bootmem_allocator().

This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.

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

arch/sh/kernel/machine_kexec.c

+0 −21
Original line number Diff line number Diff line
@@ -104,24 +104,3 @@ NORET_TYPE void machine_kexec(struct kimage *image) 
	(*rnk)(page_list, reboot_code_buffer, image->start, vbr_reg);

}

/* crashkernel=size@addr specifies the location to reserve for

 * a crash kernel.  By reserving this memory we guarantee

 * that linux never sets it up as a DMA target.

 * Useful for holding code to do something appropriate

 * after a kernel panic.

 */

static int __init parse_crashkernel(char *arg)

{

	unsigned long size, base;

	size = memparse(arg, &arg);

	if (*arg == '@') {

		base = memparse(arg+1, &arg);

		/* FIXME: Do I want a sanity check

		 * to validate the memory range?

		 */

		crashk_res.start = base;

		crashk_res.end   = base + size - 1;

	}

	return 0;

}

early_param("crashkernel", parse_crashkernel);

arch/sh/kernel/setup.c

+33 −5
Original line number Diff line number Diff line
@@ -128,6 +128,37 @@ static void __init register_bootmem_low_pages(void) 
	free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(pages));

}



#ifdef CONFIG_KEXEC

static void __init reserve_crashkernel(void)

{

	unsigned long long free_mem;

	unsigned long long crash_size, crash_base;

	int ret;



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



	ret = parse_crashkernel(boot_command_line, free_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size) {

		if (crash_base > 0) {

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

			crashk_res.start = crash_base;

			crashk_res.end   = crash_base + crash_size - 1;

			reserve_bootmem(crash_base, crash_size);

		} else

			printk(KERN_INFO "crashkernel reservation failed - "

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

	}

}

#else

static inline void __init reserve_crashkernel(void)

{}

#endif



void __init setup_bootmem_allocator(unsigned long free_pfn)

{

	unsigned long bootmap_size;
@@ -189,11 +220,8 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) 
		}

	}

#endif

#ifdef CONFIG_KEXEC

	if (crashk_res.start != crashk_res.end)

		reserve_bootmem(crashk_res.start,

			crashk_res.end - crashk_res.start + 1);

#endif



	reserve_crashkernel();

}



#ifndef CONFIG_NEED_MULTIPLE_NODES

CRA Git | Maintained and supported by SUSTech CRA and CCSE