From 2522656b870999f2d2483125b3f6356da21c3278 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Wed, 15 Aug 2007 16:12:18 +0200 Subject: [PATCH] --- yaml --- r: 64059 b: refs/heads/master c: 6f834197a79d34d65ca44e9c77f2571edbcfb64b h: refs/heads/master i: 64057: 05432698b49613021dd5898588dd1ba38b8bee44 64055: 3807f833c1ad5b55b8404f6d301c90850ff397ff v: v3 --- [refs] | 2 +- trunk/include/asm-avr32/pgtable.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9fb26c8ab4b5..025196180c30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7f3bac95e0bdfd520e065c4a29aad46190fcc99 +refs/heads/master: 6f834197a79d34d65ca44e9c77f2571edbcfb64b diff --git a/trunk/include/asm-avr32/pgtable.h b/trunk/include/asm-avr32/pgtable.h index c07bdd10b891..018f6e2a0242 100644 --- a/trunk/include/asm-avr32/pgtable.h +++ b/trunk/include/asm-avr32/pgtable.h @@ -32,8 +32,6 @@ #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) #define FIRST_USER_ADDRESS 0 -#define PTE_PHYS_MASK 0x1ffff000 - #ifndef __ASSEMBLY__ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern void paging_init(void); @@ -265,7 +263,7 @@ static inline pte_t pte_mkyoung(pte_t pte) * trivial. */ #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) -#define pte_page(x) phys_to_page(pte_val(x) & PTE_PHYS_MASK) +#define pte_page(x) (pfn_to_page(pte_pfn(x))) /* * Mark the prot value as uncacheable and unbufferable