diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-22 23:46:21 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-22 23:46:21 -0400 |
| commit | 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 (patch) | |
| tree | 954409d34f4bbb1fb4afb95a7c78694169c5036f | |
| parent | da5e37efe8704fc2b354626467f80f73c5e3c020 (diff) | |
| parent | 23dcab8f8e89bb25d7e156ffec4b27542d1f737a (diff) | |
Merge commit 'kumar/merge' into merge
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 2a9cd74a841e..076327f2eff7 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
| @@ -8,9 +8,9 @@ | |||
| 8 | * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory | 8 | * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory |
| 9 | * and therefore we can only deal with memory within this range | 9 | * and therefore we can only deal with memory within this range |
| 10 | */ | 10 | */ |
| 11 | #define KEXEC_SOURCE_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | 11 | #define KEXEC_SOURCE_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1) |
| 12 | #define KEXEC_DESTINATION_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | 12 | #define KEXEC_DESTINATION_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1) |
| 13 | #define KEXEC_CONTROL_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | 13 | #define KEXEC_CONTROL_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL - 1) |
| 14 | 14 | ||
| 15 | #else | 15 | #else |
| 16 | 16 | ||