From 3aa70ef17f4d70f3e132f0e70890f8245fde8105 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 30 Apr 2008 14:47:12 +1000
Subject: [PATCH] --- yaml --- r: 95323 b: refs/heads/master c:
 eabd90944b3a00766e84da3d117ea0f3e0a3b1a3 h: refs/heads/master i:   95321:
 01d3871e4d8e4182dd6bc8931f33dbee9be6d6ff   95319:
 4eaa1f8b7b584ba6665efa7847ea783e0734de58 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/kernel/machine_kexec.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aba6083c940f..6af2408a24b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3243d87441bf7f97c5c9f7dd46b35f5783ec6740
+refs/heads/master: eabd90944b3a00766e84da3d117ea0f3e0a3b1a3
diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c
index 2d202f274e73..29a0e039d436 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec.c
@@ -74,20 +74,20 @@ void __init reserve_crashkernel(void)
 	ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(),
 			&crash_size, &crash_base);
 	if (ret == 0 && crash_size > 0) {
-		if (crash_base == 0)
-			crash_base = KDUMP_KERNELBASE;
 		crashk_res.start = crash_base;
-	} else {
-		/* handle the device tree */
-		crash_size = crashk_res.end - crashk_res.start + 1;
+		crashk_res.end = crash_base + crash_size - 1;
 	}
 
-	if (crash_size == 0)
+	if (crashk_res.end == crashk_res.start) {
+		crashk_res.start = crashk_res.end = 0;
 		return;
+	}
 
 	/* We might have got these values via the command line or the
 	 * device tree, either way sanitise them now. */
 
+	crash_size = crashk_res.end - crashk_res.start + 1;
+
 	if (crashk_res.start != KDUMP_KERNELBASE)
 		printk("Crash kernel location must be 0x%x\n",
 				KDUMP_KERNELBASE);