diff options
author | Scott Wood <scottwood@freescale.com> | 2015-10-07 03:48:17 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-10-27 23:13:28 (GMT) |
commit | ecc4999f68d157a25c500d18586a16f09a029cb4 (patch) | |
tree | 7c6a96c0afba6bed7278e22f2055f8207664a0a7 | |
parent | eeaab663a06c3ddc7213d30d304de73e30bc772e (diff) | |
download | linux-ecc4999f68d157a25c500d18586a16f09a029cb4.tar.xz |
powerpc/book3e-64: Don't limit paca to 256 MiB
This limit only makes sense on book3s, and on book3e it can cause
problems with kdump if we don't have any memory under 256 MiB.
Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r-- | arch/powerpc/kernel/paca.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 5a23b69..01ea0ed 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -204,14 +204,19 @@ static int __initdata paca_size; void __init allocate_pacas(void) { - int cpu, limit; + u64 limit; + int cpu; + limit = ppc64_rma_size; + +#ifdef CONFIG_PPC_BOOK3S_64 /* * We can't take SLB misses on the paca, and we want to access them * in real mode, so allocate them within the RMA and also within * the first segment. */ - limit = min(0x10000000ULL, ppc64_rma_size); + limit = min(0x10000000ULL, limit); +#endif paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids); |