Merge branches 'sh/core' and 'sh/kexec' into sh-latest
This commit is contained in:
commit
9060c05b50
|
@ -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
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <linux/cpumask.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/percpu.h>
|
||||
#include <linux/topology.h>
|
||||
#include <linux/node.h>
|
||||
#include <linux/nodemask.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue