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

mm: rename p4d_page_vaddr to p4d_pgtable and make it return pud_t * 

No functional change in this patch.

[aneesh.kumar@linux.ibm.com: m68k build error reported by kernel robot]
  Link: https://lkml.kernel.org/r/87tulxnb2v.fsf@linux.ibm.com

Link: https://lkml.kernel.org/r/20210615110859.320299-2-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>
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 9cf6fa24

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -710,9 +710,9 @@ static inline phys_addr_t p4d_page_paddr(p4d_t p4d) 
	return __p4d_to_phys(p4d);

}



static inline unsigned long p4d_page_vaddr(p4d_t p4d)

static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	return (unsigned long)__va(p4d_page_paddr(p4d));

	return (pud_t *)__va(p4d_page_paddr(p4d));

}



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

arch/ia64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ ia64_phys_addr_valid (unsigned long addr) 
#define p4d_bad(p4d)			(!ia64_phys_addr_valid(p4d_val(p4d)))

#define p4d_present(p4d)		(p4d_val(p4d) != 0UL)

#define p4d_clear(p4dp)			(p4d_val(*(p4dp)) = 0UL)

#define p4d_page_vaddr(p4d)		((unsigned long) __va(p4d_val(p4d) & _PFN_MASK))

#define p4d_pgtable(p4d)		((pud_t *) __va(p4d_val(p4d) & _PFN_MASK))

#define p4d_page(p4d)			virt_to_page((p4d_val(p4d) + PAGE_OFFSET))

#endif

arch/mips/include/asm/pgtable-64.h

+2 −2
Original line number Diff line number Diff line
@@ -209,9 +209,9 @@ static inline void p4d_clear(p4d_t *p4dp) 
	p4d_val(*p4dp) = (unsigned long)invalid_pud_table;

}



static inline unsigned long p4d_page_vaddr(p4d_t p4d)

static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	return p4d_val(p4d);

	return (pud_t *)p4d_val(p4d);

}



#define p4d_phys(p4d)		virt_to_phys((void *)p4d_val(p4d))

arch/powerpc/include/asm/book3s/64/pgtable.h

+4 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,10 @@ extern struct page *p4d_page(p4d_t p4d); 
/* Pointers in the page table tree are physical addresses */

#define __pgtable_ptr_val(ptr)	__pa(ptr)



#define p4d_page_vaddr(p4d)	__va(p4d_val(p4d) & ~P4D_MASKED_BITS)

static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	return (pud_t *)__va(p4d_val(p4d) & ~P4D_MASKED_BITS);

}



static inline pmd_t *pud_pgtable(pud_t pud)

{

arch/powerpc/include/asm/nohash/64/pgtable-4k.h

+5 −1
Original line number Diff line number Diff line
@@ -56,10 +56,14 @@ 
#define p4d_none(p4d)		(!p4d_val(p4d))

#define p4d_bad(p4d)		(p4d_val(p4d) == 0)

#define p4d_present(p4d)	(p4d_val(p4d) != 0)

#define p4d_page_vaddr(p4d)	(p4d_val(p4d) & ~P4D_MASKED_BITS)



#ifndef __ASSEMBLY__



static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	return (pud_t *) (p4d_val(p4d) & ~P4D_MASKED_BITS);

}



static inline void p4d_clear(p4d_t *p4dp)

{

	*p4dp = __p4d(0);