diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-23 05:46:21 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-23 05:46:21 +0200 |
| commit | 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 (patch) | |
| tree | 954409d34f4bbb1fb4afb95a7c78694169c5036f | |
| parent | vmlinux.lds: fix .data..init_task output section (fix popwerpc boot) (diff) | |
| parent | powerpc/kexec: Fix boundary case for book-e kexec memory limits (diff) | |
| download | linux-7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14.tar.xz linux-7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14.zip | |
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 @@ * 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 |