diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-08-27 05:15:43 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-08-28 01:52:58 -0400 |
commit | 34894c7843e00972d88b3592027703d4e05a06a7 (patch) | |
tree | f82e827a4e061894012b0bac3ed714890186eeac /arch/sh | |
parent | e311be521fa9daedd8959d1a89f5e9bc5b54bb40 (diff) |
sh: crash kernel resource fix
The reserved crash kernel memory range is currently missing from
/proc/iomem. crashk_res is mistakenly setup after __add_active_range().
Reorder things to make sure the resource shows up in /proc/iomem.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/setup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index a35207655e7b..de832056bf1b 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -171,6 +171,7 @@ static void __init reserve_crashkernel(void) | |||
171 | (unsigned long)(free_mem >> 20)); | 171 | (unsigned long)(free_mem >> 20)); |
172 | crashk_res.start = crash_base; | 172 | crashk_res.start = crash_base; |
173 | crashk_res.end = crash_base + crash_size - 1; | 173 | crashk_res.end = crash_base + crash_size - 1; |
174 | insert_resource(&iomem_resource, &crashk_res); | ||
174 | } | 175 | } |
175 | } | 176 | } |
176 | #else | 177 | #else |
@@ -204,11 +205,6 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, | |||
204 | request_resource(res, &data_resource); | 205 | request_resource(res, &data_resource); |
205 | request_resource(res, &bss_resource); | 206 | request_resource(res, &bss_resource); |
206 | 207 | ||
207 | #ifdef CONFIG_KEXEC | ||
208 | if (crashk_res.start != crashk_res.end) | ||
209 | request_resource(res, &crashk_res); | ||
210 | #endif | ||
211 | |||
212 | add_active_range(nid, start_pfn, end_pfn); | 208 | add_active_range(nid, start_pfn, end_pfn); |
213 | } | 209 | } |
214 | 210 | ||