1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c
index 6d724dab27c2..846cbad45fce 100644
--- a/arch/powerpc/mm/mmu_context_book3s64.c
+++ b/arch/powerpc/mm/mmu_context_book3s64.c
@@ -93,11 +93,11 @@ static int hash__init_new_context(struct mm_struct *mm)
                 return index;
 
         /*
-         * We do switch_slb() early in fork, even before we setup the
-         * mm->context.addr_limit. Default to max task size so that we copy the
-         * default values to paca which will help us to handle slb miss early.
+         * In the case of exec, use the default limit,
+         * otherwise inherit it from the mm we are duplicating.
          */
-        mm->context.addr_limit = DEFAULT_MAP_WINDOW_USER64;
+        if (!mm->context.addr_limit)
+                mm->context.addr_limit = DEFAULT_MAP_WINDOW_USER64;
 
         /*
          * The old code would re-promote on fork, we don't do that when using