aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2011-09-01 23:47:12 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-09-05 00:10:50 -0400
commit41309b7a22805f1650c600723d729af453d52719 (patch)
treee9c1b4734136e3028e6ae41a5aa9fc04c647b2e3 /arch
parent9e79e3e9dd9672b37ac9412e9a926714306551fe (diff)
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: Simon Horman <horms@verge.net.au> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/setup.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 58bff45d1156..1a0e946679a4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -211,13 +211,16 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
211 } 211 }
212 212
213 /* 213 /*
214 * We don't know which RAM region contains kernel data, 214 * We don't know which RAM region contains kernel data or
215 * so we try it repeatedly and let the resource manager 215 * the reserved crashkernel region, so try it repeatedly
216 * test it. 216 * and let the resource manager test it.
217 */ 217 */
218 request_resource(res, &code_resource); 218 request_resource(res, &code_resource);
219 request_resource(res, &data_resource); 219 request_resource(res, &data_resource);
220 request_resource(res, &bss_resource); 220 request_resource(res, &bss_resource);
221#ifdef CONFIG_KEXEC
222 request_resource(res, &crashk_res);
223#endif
221 224
222 /* 225 /*
223 * Also make sure that there is a PMB mapping that covers this 226 * Also make sure that there is a PMB mapping that covers this