diff options
| author | Aneesh Kumar K.V | 2016-05-02 14:56:07 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-05-11 13:54:00 +0200 |
| commit | 62ccf5bf1f4704986844440069df70b6509a9213 (patch) | |
| tree | b36ff4cb9f876fb13fc530458ab5ad9df45946db | |
| parent | powerpc/mm/subpage: Initialise user psize correctly (diff) | |
| download | kernel-qcow2-linux-62ccf5bf1f4704986844440069df70b6509a9213.tar.gz kernel-qcow2-linux-62ccf5bf1f4704986844440069df70b6509a9213.tar.xz kernel-qcow2-linux-62ccf5bf1f4704986844440069df70b6509a9213.zip | |
powerpc/mm/slice: Remove slice_mm_new_context()
The usage in mm mmu_context_nohash.c is bogus, because we set the
context.id value to MMU_NO_CONTEXT 4 lines previously in the same
function, meaning slice_mm_new_context() will always be true.
The book3s 64 usage was removed in the previous commit. So remove it as
unused.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/include/asm/page_64.h | 3 | ||||
| -rw-r--r-- | arch/powerpc/mm/mmu_context_nohash.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h index 77488857c26d..dd5f0712afa2 100644 --- a/arch/powerpc/include/asm/page_64.h +++ b/arch/powerpc/include/asm/page_64.h @@ -128,8 +128,6 @@ extern void slice_set_user_psize(struct mm_struct *mm, unsigned int psize); extern void slice_set_range_psize(struct mm_struct *mm, unsigned long start, unsigned long len, unsigned int psize); -#define slice_mm_new_context(mm) ((mm)->context.id == MMU_NO_CONTEXT) - #endif /* __ASSEMBLY__ */ #else #define slice_init() @@ -151,7 +149,6 @@ do { \ #define slice_set_range_psize(mm, start, len, psize) \ slice_set_user_psize((mm), (psize)) -#define slice_mm_new_context(mm) 1 #endif /* CONFIG_PPC_MM_SLICES */ #ifdef CONFIG_HUGETLB_PAGE diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index a36c43a27893..7d95bc402dba 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c @@ -335,8 +335,7 @@ int init_new_context(struct task_struct *t, struct mm_struct *mm) mm->context.active = 0; #ifdef CONFIG_PPC_MM_SLICES - if (slice_mm_new_context(mm)) - slice_set_user_psize(mm, mmu_virtual_psize); + slice_set_user_psize(mm, mmu_virtual_psize); #endif return 0; |