[PATCH V2 62/68] powerpc/mm: Drop PTE_ATOMIC_UPDATES from pmd_hugepage_update
From: Aneesh Kumar K.V <hidden>
Date: 2016-04-09 06:17:14
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
THP is only supported by hash64 now and for that we should always have PTE_ATOMIC_UPDATES always set. Drop the unnecessary #ifdef in the code. Signed-off-by: Aneesh Kumar K.V <redacted> --- arch/powerpc/mm/pgtable_64.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 0e980204c4d5..092c07115612 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c@@ -475,7 +475,6 @@ unsigned long pmd_hugepage_update(struct mm_struct *mm, unsigned long addr, assert_spin_locked(&mm->page_table_lock); #endif -#ifdef PTE_ATOMIC_UPDATES clr = cpu_to_be64(clr); set = cpu_to_be64(set); __asm__ __volatile__(
@@ -491,10 +490,7 @@ unsigned long pmd_hugepage_update(struct mm_struct *mm, unsigned long addr, : "cc" ); old = be64_to_cpu(old); -#else - old = pmd_val(*pmdp); - *pmdp = __pmd((old & ~clr) | set); -#endif + trace_hugepage_update(addr, old, clr, set); if (old & H_PAGE_HASHPTE) hpte_do_hugepage_flush(mm, addr, pmdp, old);
--
2.5.0