mm/arm: remove pmd_thp_or_huge()

ARM/ARM64 used to define pmd_thp_or_huge(). Now this macro is completely
redundant. Remove it and use pmd_leaf().

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Peter Xu <[e-mail]>
Cc: Mark Salter <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Shawn Guo <[e-mail]>
Cc: Krzysztof Kozlowski <[e-mail]>
Cc: Bjorn Andersson <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Konrad Dybcio <[e-mail]>
Cc: Fabio Estevam <[e-mail]>
Cc: Alistair Popple <[e-mail]>
Cc: Andreas Larsson <[e-mail]>
Cc: "Aneesh Kumar K.V" <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Christophe Leroy <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: David S. Miller <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Lucas Stach <[e-mail]>
Cc: "Matthew Wilcox (Oracle)" <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Mike Rapoport (IBM) <[e-mail]>
Cc: Muchun Song <[e-mail]>
Cc: Naoya Horiguchi <[e-mail]>
Cc: "Naveen N. Rao" <[e-mail]>
Cc: Nicholas Piggin <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>

arch/arm/include/asm/pgtable-2level.h

···
  * define empty stubs for use by pin_page_for_write.
  */
 #define pmd_hugewillfault(pmd)	(0)
-#define pmd_thp_or_huge(pmd)	(0)
 
 #endif /* __ASSEMBLY__ */
 

arch/arm/include/asm/pgtable-3level.h

···
 #define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))
 
 #define pmd_hugewillfault(pmd)	(!pmd_young(pmd) || !pmd_write(pmd))
-#define pmd_thp_or_huge(pmd)	(pmd_leaf(pmd) || pmd_trans_huge(pmd))
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 #define pmd_trans_huge(pmd)	(pmd_val(pmd) && !pmd_table(pmd))

arch/arm/lib/uaccess_with_memcpy.c

···
 	 * to see that it's still huge and whether or not we will
 	 * need to fault on write.
 	 */
-	if (unlikely(pmd_thp_or_huge(*pmd))) {
+	if (unlikely(pmd_leaf(*pmd))) {
 		ptl = &current->mm->page_table_lock;
 		spin_lock(ptl);
-		if (unlikely(!pmd_thp_or_huge(*pmd)
+		if (unlikely(!pmd_leaf(*pmd)
 			|| pmd_hugewillfault(*pmd))) {
 			spin_unlock(ptl);
 			return 0;

arch/arm64/include/asm/pgtable.h

···
 	return pmd;
 }
 
-#define pmd_thp_or_huge(pmd)	(pmd_leaf(pmd) || pmd_trans_huge(pmd))
-
 #define pmd_write(pmd)		pte_write(pmd_pte(pmd))
 
 #define pmd_mkhuge(pmd)		(__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))