浏览代码

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>
Aneesh Kumar K.V 9 年之前
父节点
当前提交
62ccf5bf1f
共有 2 个文件被更改,包括 1 次插入5 次删除
  1. 0 3
      arch/powerpc/include/asm/page_64.h
  2. 1 2
      arch/powerpc/mm/mmu_context_nohash.c

+ 0 - 3
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,
 extern void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
 				  unsigned long len, unsigned int psize);
 				  unsigned long len, unsigned int psize);
 
 
-#define slice_mm_new_context(mm)	((mm)->context.id == MMU_NO_CONTEXT)
-
 #endif /* __ASSEMBLY__ */
 #endif /* __ASSEMBLY__ */
 #else
 #else
 #define slice_init()
 #define slice_init()
@@ -151,7 +149,6 @@ do {						\
 
 
 #define slice_set_range_psize(mm, start, len, psize)	\
 #define slice_set_range_psize(mm, start, len, psize)	\
 	slice_set_user_psize((mm), (psize))
 	slice_set_user_psize((mm), (psize))
-#define slice_mm_new_context(mm)	1
 #endif /* CONFIG_PPC_MM_SLICES */
 #endif /* CONFIG_PPC_MM_SLICES */
 
 
 #ifdef CONFIG_HUGETLB_PAGE
 #ifdef CONFIG_HUGETLB_PAGE

+ 1 - 2
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;
 	mm->context.active = 0;
 
 
 #ifdef CONFIG_PPC_MM_SLICES
 #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
 #endif
 
 
 	return 0;
 	return 0;