From: Dave McCracken It looks like I missed a couple of places. I guess I forgot to doublecheck for new code with pmd_page_kernel in it. Here's a patch with the additional places fixed. Signed-off-by: Dave McCracken Cc: Haavard Skinnemoen Signed-off-by: Andrew Morton --- include/asm-avr32/pgtable.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/asm-avr32/pgtable.h~avr32-standardize-pxx_page-macros-fix include/asm-avr32/pgtable.h --- a/include/asm-avr32/pgtable.h~avr32-standardize-pxx_page-macros-fix +++ a/include/asm-avr32/pgtable.h @@ -324,7 +324,7 @@ static inline pte_t pte_modify(pte_t pte #define page_pte(page) page_pte_prot(page, __pgprot(0)) -#define pmd_page_kernel(pmd) \ +#define pmd_page_vaddr(pmd) \ ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) #define pmd_page(pmd) (phys_to_page(pmd_val(pmd))) @@ -342,9 +342,9 @@ static inline pte_t pte_modify(pte_t pte #define pte_index(address) \ ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) #define pte_offset(dir, address) \ - ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address)) + ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) #define pte_offset_kernel(dir, address) \ - ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address)) + ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) #define pte_offset_map(dir, address) pte_offset_kernel(dir, address) #define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address) #define pte_unmap(pte) do { } while (0) _