aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-23 13:46:21 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-23 13:46:21 +1000
commit7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 (patch)
tree954409d34f4bbb1fb4afb95a7c78694169c5036f /arch
parentda5e37efe8704fc2b354626467f80f73c5e3c020 (diff)
parent23dcab8f8e89bb25d7e156ffec4b27542d1f737a (diff)
downloadmrst-s0i3-test-7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14.tar.gz
mrst-s0i3-test-7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14.tar.xz
mrst-s0i3-test-7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14.zip
Merge commit 'kumar/merge' into merge
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/kexec.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 2a9cd74a841..076327f2eff 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -8,9 +8,9 @@
* On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory
* and therefore we can only deal with memory within this range
*/
-#define KEXEC_SOURCE_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL)
-#define KEXEC_DESTINATION_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL)
-#define KEXEC_CONTROL_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL)
+#define KEXEC_SOURCE_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1)
+#define KEXEC_DESTINATION_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1)
+#define KEXEC_CONTROL_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1)
#else