From c965cf698653e149fc15ae57e971c92c83bc459d Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Mon, 7 Jun 2010 15:34:38 +0000
Subject: [PATCH] --- yaml --- r: 200419 b: refs/heads/master c:
 b5416ca9f824d3deb1e25a32683100360e104b72 h: refs/heads/master i:   200417:
 c2f5981acdbbc7cad256dc0e4996d51a102f05d9   200415:
 04d8007a6079d594fba4fdc9bb0f1c6cf686ab26 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/powerpc/include/asm/kdump.h | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 35639bfe88bd..e87652d073af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8054a3428fbec2d91dfeb5bd78d7e75064cf163b
+refs/heads/master: b5416ca9f824d3deb1e25a32683100360e104b72
diff --git a/trunk/arch/powerpc/include/asm/kdump.h b/trunk/arch/powerpc/include/asm/kdump.h
index 5ebfe5d3c61f..6857af58b02e 100644
--- a/trunk/arch/powerpc/include/asm/kdump.h
+++ b/trunk/arch/powerpc/include/asm/kdump.h
@@ -3,8 +3,17 @@
 
 #include <asm/page.h>
 
-/* Kdump kernel runs at 32 MB, change at your peril. */
+/*
+ * If CONFIG_RELOCATABLE is enabled we can place the kdump kernel anywhere.
+ * To keep enough space in the RMO for the first stage kernel on 64bit, we
+ * place it at 64MB. If CONFIG_RELOCATABLE is not enabled we must place
+ * the second stage at 32MB.
+ */
+#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC64)
+#define KDUMP_KERNELBASE	0x4000000
+#else
 #define KDUMP_KERNELBASE	0x2000000
+#endif
 
 /* How many bytes to reserve at zero for kdump. The reserve limit should
  * be greater or equal to the trampoline's end address.