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

Commit 9060c05b authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/core' and 'sh/kexec' into sh-latest

parents d4d9781d 6988d647 41309b7a

arch/sh/kernel/setup.c

+6 −3
Original line number Original line 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,

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

	 *  so we try it repeatedly and let the resource manager

	 * the reserved crashkernel region, so try it repeatedly

	 *  test it.

	 * and let the resource manager test it.

	 */

	 */

	request_resource(res, &code_resource);

	request_resource(res, &code_resource);

	request_resource(res, &data_resource);

	request_resource(res, &data_resource);

	request_resource(res, &bss_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

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

arch/sh/kernel/topology.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/cpumask.h>

#include <linux/cpumask.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/percpu.h>

#include <linux/percpu.h>

#include <linux/topology.h>

#include <linux/node.h>

#include <linux/node.h>

#include <linux/nodemask.h>

#include <linux/nodemask.h>