Commit 46a82b2d authored by Dave McCracken's avatar Dave McCracken Committed by Linus Torvalds
Browse files

[PATCH] Standardize pxx_page macros 



One of the changes necessary for shared page tables is to standardize the
pxx_page macros.  pte_page and pmd_page have always returned the struct
page associated with their entry, while pte_page_kernel and pmd_page_kernel
have returned the kernel virtual address.  pud_page and pgd_page, on the
other hand, return the kernel virtual address.

Shared page tables needs pud_page and pgd_page to return the actual page
structures.  There are very few actual users of these functions, so it is
simple to standardize their usage.

Since this is basic cleanup, I am submitting these changes as a standalone
patch.  Per Hugh Dickins' comments about it, I am also changing the
pxx_page_kernel macros to pxx_page_vaddr to clarify their meaning.

Signed-off-by: default avatarDave McCracken <dmccr@us.ibm.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d2e7b7d0

arch/arm/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size) 
			 * Free the page table, if there was one.

			 */

			if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE)

				pte_free_kernel(pmd_page_kernel(pmd));

				pte_free_kernel(pmd_page_vaddr(pmd));

		}



		addr += PGDIR_SIZE;

arch/sh/mm/cache-sh7705.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#define __pte_offset(address) \

		((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

#define pte_offset(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \

#define pte_offset(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \

		__pte_offset(address))



static inline void cache_wback_all(void)

arch/sparc/mm/srmmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2175,7 +2175,7 @@ void __init ld_mmu_srmmu(void) 


	BTFIXUPSET_CALL(pte_pfn, srmmu_pte_pfn, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pmd_page, srmmu_pmd_page, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pgd_page, srmmu_pgd_page, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pgd_page_vaddr, srmmu_pgd_page, BTFIXUPCALL_NORM);



	BTFIXUPSET_SETHI(none_mask, 0xF0000000);

arch/sparc/mm/sun4c.c

+1 −1
Original line number Diff line number Diff line
@@ -2280,5 +2280,5 @@ void __init ld_mmu_sun4c(void) 


	/* These should _never_ get called with two level tables. */

	BTFIXUPSET_CALL(pgd_set, sun4c_pgd_set, BTFIXUPCALL_NOP);

	BTFIXUPSET_CALL(pgd_page, sun4c_pgd_page, BTFIXUPCALL_RETO0);

	BTFIXUPSET_CALL(pgd_page_vaddr, sun4c_pgd_page, BTFIXUPCALL_RETO0);

}

arch/um/kernel/skas/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, 
	 * destroy_context_skas.

	 */



        mm->context.skas.last_page_table = pmd_page_kernel(*pmd);

        mm->context.skas.last_page_table = pmd_page_vaddr(*pmd);

#ifdef CONFIG_3_LEVEL_PGTABLES

        mm->context.skas.last_pmd = (unsigned long) __va(pud_val(*pud));

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE