diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 15:38:12 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 15:38:12 +1000 |
| commit | 5b97259220cae53b174817aab6ab1ff1b616aaf3 (patch) | |
| tree | 69cc121a6a933518bb8c65ad96828d4e1f8778dc /arch/powerpc/mm | |
| parent | cd1154770ba984f4c766cac5ea42c38880080b1d (diff) | |
| parent | f56029410a13cae3652d1f34788045c40a13ffc7 (diff) | |
| download | linux-5b97259220cae53b174817aab6ab1ff1b616aaf3.tar.gz linux-5b97259220cae53b174817aab6ab1ff1b616aaf3.tar.bz2 linux-5b97259220cae53b174817aab6ab1ff1b616aaf3.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/mmu_context_nohash.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index af3d78e19302..928ebe79668b 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c @@ -410,17 +410,7 @@ void __init mmu_context_init(void) } else if (mmu_has_feature(MMU_FTR_TYPE_47x)) { first_context = 1; last_context = 65535; - } else -#ifdef CONFIG_PPC_BOOK3E_MMU - if (mmu_has_feature(MMU_FTR_TYPE_3E)) { - u32 mmucfg = mfspr(SPRN_MMUCFG); - u32 pid_bits = (mmucfg & MMUCFG_PIDSIZE_MASK) - >> MMUCFG_PIDSIZE_SHIFT; - first_context = 1; - last_context = (1UL << (pid_bits + 1)) - 1; - } else -#endif - { + } else { first_context = 1; last_context = 255; } |