UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Paul Mundt 2011-10-28 14:18:10 +09:00
parent d4d9781d1d 6988d64723 41309b7a22
commit 9060c05b50
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sh/kernel/setup.c
View File

@ -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

1
arch/sh/kernel/topology.c
View File

@ -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>