diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 11:32:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 11:32:52 +0200 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /arch/sh/kernel/setup.c | |
| parent | 9fcaff0e660d886e9a766460adbe558dd25de31b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | kernel_samsung_smdk4412-e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1.zip kernel_samsung_smdk4412-e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1.tar.gz kernel_samsung_smdk4412-e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1.tar.bz2 | |
Merge commit 'v2.6.27-rc6' into x86/iommu
Diffstat (limited to 'arch/sh/kernel/setup.c')
| -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 a352076..de83205 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -171,6 +171,7 @@ static void __init reserve_crashkernel(void) (unsigned long)(free_mem >> 20)); crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; + insert_resource(&iomem_resource, &crashk_res); } } #else @@ -204,11 +205,6 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, request_resource(res, &data_resource); request_resource(res, &bss_resource); -#ifdef CONFIG_KEXEC - if (crashk_res.start != crashk_res.end) - request_resource(res, &crashk_res); -#endif - add_active_range(nid, start_pfn, end_pfn); } |