summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup-common.c
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-11-09 18:27:40 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2017-11-13 13:35:43 +0100
commit4722476bce283149986a3463f61009dec0e7f6a1 (patch)
tree87ce6b6610eea7d259ff119c2c63dd8937aa8702 /arch/powerpc/kernel/setup-common.c
parentpowerpc/64s/radix: Fix 128TB-512TB virtual address boundary case allocation (diff)
downloadlinux-4722476bce283149986a3463f61009dec0e7f6a1.tar.xz
linux-4722476bce283149986a3463f61009dec0e7f6a1.zip
powerpc/64s: mm_context.addr_limit is only used on hash
Radix keeps no meaningful state in addr_limit, so remove it from radix code and rename to slb_addr_limit to make it clear it applies to hash only. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r--arch/powerpc/kernel/setup-common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index fa661ed616f5..2075322cd225 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -898,7 +898,8 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_PPC_MM_SLICES
#ifdef CONFIG_PPC64
- init_mm.context.addr_limit = DEFAULT_MAP_WINDOW_USER64;
+ if (!radix_enabled())
+ init_mm.context.slb_addr_limit = DEFAULT_MAP_WINDOW_USER64;
#else
#error "context.addr_limit not initialized."
#endif