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

Commit 41309b7a authored by Simon Horman's avatar Simon Horman Committed by Paul Mundt
Browse files

sh: kexec: Register crashk_res 



Register crashk_res so that it can be used by kexec-tools
via /proc/iomem.

The crash kernel resource needs to be requested the same as the
other kernel resources due to the fact that it's handled during
the common path for adding new memory ranges, so it's added in to
__add_active_range() with the others. This ensures that the crash
kernel is properly reserved regardless of which memory range it's
placed in.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 9e79e3e9

arch/sh/kernel/setup.c

+6 −3
Original line number Diff line number Diff line
@@ -211,13 +211,16 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, 
	}



	/*

	 *  We don't know which RAM region contains kernel data,

	 *  so we try it repeatedly and let the resource manager

	 *  test it.

	 * We don't know which RAM region contains kernel data or

	 * the reserved crashkernel region, so try it repeatedly

	 * and let the resource manager test it.

	 */

	request_resource(res, &code_resource);

	request_resource(res, &data_resource);

	request_resource(res, &bss_resource);

#ifdef CONFIG_KEXEC

	request_resource(res, &crashk_res);

#endif



	/*

	 * Also make sure that there is a PMB mapping that covers this