diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 14:57:47 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 14:57:47 +1000 |
| commit | b5f1bf48f2644ee7151674819f1c15c86dca87f1 (patch) | |
| tree | 2e3524ab1eb0a937c629062bec0bbc661f060bb2 /arch/powerpc/mm/mmu_context_book3s64.c | |
| parent | 95ec77c06e8e63fff50c497eca0668bf6da39813 (diff) | |
| parent | bfa37087aa04e45f56c41142dfceecb79b8e6ef9 (diff) | |
| download | talos-op-linux-b5f1bf48f2644ee7151674819f1c15c86dca87f1.tar.gz talos-op-linux-b5f1bf48f2644ee7151674819f1c15c86dca87f1.zip | |
Merge tag 'powerpc-4.7-5' into next
Pull in the fixes we sent during 4.7, we have code we want to merge into
next that depends on some of them.
Diffstat (limited to 'arch/powerpc/mm/mmu_context_book3s64.c')
| -rw-r--r-- | arch/powerpc/mm/mmu_context_book3s64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c index 227b2a6c4544..196222227e82 100644 --- a/arch/powerpc/mm/mmu_context_book3s64.c +++ b/arch/powerpc/mm/mmu_context_book3s64.c @@ -65,7 +65,7 @@ static int radix__init_new_context(struct mm_struct *mm, int index) /* * set the process table entry, */ - rts_field = 3ull << PPC_BITLSHIFT(2); + rts_field = radix__get_tree_size(); process_tb[index].prtb0 = cpu_to_be64(rts_field | __pa(mm->pgd) | RADIX_PGD_INDEX_SIZE); return 0; } |
