Commit 9cf6fa24 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t * 

No functional change in this patch.

[aneesh.kumar@linux.ibm.com: fix]
  Link: https://lkml.kernel.org/r/87wnqtnb60.fsf@linux.ibm.com
[sfr@canb.auug.org.au: another fix]
  Link: https://lkml.kernel.org/r/20210619134410.89559-1-aneesh.kumar@linux.ibm.com

Link: https://lkml.kernel.org/r/20210615110859.320299-1-aneesh.kumar@linux.ibm.com
Link: https://lore.kernel.org/linuxppc-dev/CAHk-=wi+J+iodze9FtjM3Zi4j4OeS+qqbKxME9QN4roxPEXH9Q@mail.gmail.com/


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Hugh Dickins <hughd@google.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 44e8a5e9

arch/alpha/include/asm/pgtable.h

+5 −3
Original line number Diff line number Diff line
@@ -236,8 +236,10 @@ pmd_page_vaddr(pmd_t pmd) 
#define pmd_page(pmd)	(pfn_to_page(pmd_val(pmd) >> 32))

#define pud_page(pud)	(pfn_to_page(pud_val(pud) >> 32))



extern inline unsigned long pud_page_vaddr(pud_t pgd)

{ return PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)); }

extern inline pmd_t *pud_pgtable(pud_t pgd)

{

	return (pmd_t *)(PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)));

}



extern inline int pte_none(pte_t pte)		{ return !pte_val(pte); }

extern inline int pte_present(pte_t pte)	{ return pte_val(pte) & _PAGE_VALID; }
@@ -287,7 +289,7 @@ extern inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= __ACCESS_BITS; retu 
/* Find an entry in the second-level page table.. */

extern inline pmd_t * pmd_offset(pud_t * dir, unsigned long address)

{

	pmd_t *ret = (pmd_t *) pud_page_vaddr(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));

	pmd_t *ret = pud_pgtable(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));

	smp_rmb(); /* see above */

	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
		flush_pmd_entry(pudp);	\

	} while (0)



static inline pmd_t *pud_page_vaddr(pud_t pud)

static inline pmd_t *pud_pgtable(pud_t pud)

{

	return __va(pud_val(pud) & PHYS_MASK & (s32)PAGE_MASK);

}

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -649,9 +649,9 @@ static inline phys_addr_t pud_page_paddr(pud_t pud) 
	return __pud_to_phys(pud);

}



static inline unsigned long pud_page_vaddr(pud_t pud)

static inline pmd_t *pud_pgtable(pud_t pud)

{

	return (unsigned long)__va(pud_page_paddr(pud));

	return (pmd_t *)__va(pud_page_paddr(pud));

}



/* Find an entry in the second-level page table. */

arch/ia64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ ia64_phys_addr_valid (unsigned long addr) 
#define pud_bad(pud)			(!ia64_phys_addr_valid(pud_val(pud)))

#define pud_present(pud)		(pud_val(pud) != 0UL)

#define pud_clear(pudp)			(pud_val(*(pudp)) = 0UL)

#define pud_page_vaddr(pud)		((unsigned long) __va(pud_val(pud) & _PFN_MASK))

#define pud_pgtable(pud)		((pmd_t *) __va(pud_val(pud) & _PFN_MASK))

#define pud_page(pud)			virt_to_page((pud_val(pud) + PAGE_OFFSET))



#if CONFIG_PGTABLE_LEVELS == 4

arch/m68k/include/asm/motorola_pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static inline void pud_set(pud_t *pudp, pmd_t *pmdp) 


#define __pte_page(pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))

#define pmd_page_vaddr(pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK))

#define pud_page_vaddr(pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))

#define pud_pgtable(pud) ((pmd_t *)__va(pud_val(pud) & _TABLE_MASK))





#define pte_none(pte)		(!pte_val(pte))