Commit 90ec2df9 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

ptdesc: remove ptdesc_to_virt() 

This has the same effect as ptdesc_address() so convert the callers to use
that and delete the function.  Add kernel-doc for ptdesc_address().

Link: https://lkml.kernel.org/r/20250908171104.2409217-4-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f0c92726

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static void *__init late_alloc(unsigned long sz) 


	if (!ptdesc || !pagetable_pte_ctor(NULL, ptdesc))

		BUG();

	return ptdesc_to_virt(ptdesc);

	return ptdesc_address(ptdesc);

}



static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,

arch/s390/mm/pgalloc.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ unsigned long *crst_table_alloc(struct mm_struct *mm) 


	if (!ptdesc)

		return NULL;

	table = ptdesc_to_virt(ptdesc);

	table = ptdesc_address(ptdesc);

	__arch_set_page_dat(table, 1UL << CRST_ALLOC_ORDER);

	return table;

}
@@ -119,7 +119,7 @@ struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm) 


	ptdesc = pagetable_alloc(GFP_KERNEL, 0);

	if (ptdesc) {

		table = (u64 *)ptdesc_to_virt(ptdesc);

		table = (u64 *)ptdesc_address(ptdesc);

		__arch_set_page_dat(table, 1);

		memset64(table, _PAGE_INVALID, PTRS_PER_PTE);

		memset64(table + PTRS_PER_PTE, 0, PTRS_PER_PTE);
@@ -146,7 +146,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm) 
		pagetable_free(ptdesc);

		return NULL;

	}

	table = ptdesc_to_virt(ptdesc);

	table = ptdesc_address(ptdesc);

	__arch_set_page_dat(table, 1);

	memset64((u64 *)table, _PAGE_INVALID, PTRS_PER_PTE);

	memset64((u64 *)table + PTRS_PER_PTE, 0, PTRS_PER_PTE);

include/linux/mm.h

+6 −5
Original line number Diff line number Diff line
@@ -2944,11 +2944,12 @@ static inline struct ptdesc *virt_to_ptdesc(const void *x) 
	return page_ptdesc(virt_to_page(x));

}



static inline void *ptdesc_to_virt(const struct ptdesc *pt)

{

	return page_to_virt(ptdesc_page(pt));

}



/**

 * ptdesc_address - Virtual address of page table.

 * @pt: Page table descriptor.

 *

 * Return: The first byte of the page table described by @pt.

 */

static inline void *ptdesc_address(const struct ptdesc *pt)

{

	return folio_address(ptdesc_folio(pt));