Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / arch / powerpc / mm / mmu_context_64.c

diff --git a/arch/powerpc/mm/mmu_context_64.c b/arch/powerpc/mm/mmu_context_64.c
index 901ea765f14618ef2e469fa78eb5bb78b877b396..1db38ba1f544e003a40c48a9b5652834bfa4bf27 100644 (file)
--- a/arch/powerpc/mm/mmu_context_64.c
+++ b/arch/powerpc/mm/mmu_context_64.c
@@ -49,18 +49,12 @@ again:
                return -ENOMEM;
        }
 
-#ifdef CONFIG_PPC_MM_SLICES
        /* The old code would re-promote on fork, we don't do that
         * when using slices as it could cause problem promoting slices
         * that have been forced down to 4K
         */
-       if (mm->context.id == 0)
+       if (slice_mm_new_context(mm))
                slice_set_user_psize(mm, mmu_virtual_psize);
-#else
-       mm->context.user_psize = mmu_virtual_psize;
-       mm->context.sllp = SLB_VSID_USER |
-               mmu_psize_defs[mmu_virtual_psize].sllp;
-#endif
        mm->context.id = index;
 
        return 0;