aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2010-07-22 13:30:44 -0500
committerKumar Gala <galak@kernel.crashing.org>2010-07-22 13:31:14 -0500
commit23dcab8f8e89bb25d7e156ffec4b27542d1f737a (patch)
tree74b9a01497d6cf053c4cd87ca27ac5df3a7b9ae2
parentcd5b8f8755a89a57fc8c408d284b8b613f090345 (diff)
downloadmrst-s0i3-test-23dcab8f8e89bb25d7e156ffec4b27542d1f737a.tar.gz
mrst-s0i3-test-23dcab8f8e89bb25d7e156ffec4b27542d1f737a.tar.xz
mrst-s0i3-test-23dcab8f8e89bb25d7e156ffec4b27542d1f737a.zip
powerpc/kexec: Fix boundary case for book-e kexec memory limits
The KEXEC_*_MEMORY_LIMITs are inclusive addresses. We define them as 2Gs as that is what we allow mapping via TLBs. However, this should be 2G - 1 to be inclusive, otherwise if we have >2G of memory in a system we fail to boot properly via kexec. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-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