diff options
| -rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 2d202f274e73..29a0e039d436 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c | |||
| @@ -74,20 +74,20 @@ void __init reserve_crashkernel(void) | |||
| 74 | ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(), | 74 | ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(), |
| 75 | &crash_size, &crash_base); | 75 | &crash_size, &crash_base); |
| 76 | if (ret == 0 && crash_size > 0) { | 76 | if (ret == 0 && crash_size > 0) { |
| 77 | if (crash_base == 0) | ||
| 78 | crash_base = KDUMP_KERNELBASE; | ||
| 79 | crashk_res.start = crash_base; | 77 | crashk_res.start = crash_base; |
| 80 | } else { | 78 | crashk_res.end = crash_base + crash_size - 1; |
| 81 | /* handle the device tree */ | ||
| 82 | crash_size = crashk_res.end - crashk_res.start + 1; | ||
| 83 | } | 79 | } |
| 84 | 80 | ||
| 85 | if (crash_size == 0) | 81 | if (crashk_res.end == crashk_res.start) { |
| 82 | crashk_res.start = crashk_res.end = 0; | ||
| 86 | return; | 83 | return; |
| 84 | } | ||
| 87 | 85 | ||
| 88 | /* We might have got these values via the command line or the | 86 | /* We might have got these values via the command line or the |
| 89 | * device tree, either way sanitise them now. */ | 87 | * device tree, either way sanitise them now. */ |
| 90 | 88 | ||
| 89 | crash_size = crashk_res.end - crashk_res.start + 1; | ||
| 90 | |||
| 91 | if (crashk_res.start != KDUMP_KERNELBASE) | 91 | if (crashk_res.start != KDUMP_KERNELBASE) |
| 92 | printk("Crash kernel location must be 0x%x\n", | 92 | printk("Crash kernel location must be 0x%x\n", |
| 93 | KDUMP_KERNELBASE); | 93 | KDUMP_KERNELBASE); |
