diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-15 16:12:18 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-15 16:36:56 +0200 |
| commit | 6f834197a79d34d65ca44e9c77f2571edbcfb64b (patch) | |
| tree | 3cd3bf8534e1f041cd94f16d205925b74186bea2 /include/asm-avr32 | |
| parent | e7f3bac95e0bdfd520e065c4a29aad46190fcc99 (diff) | |
| download | lwn-6f834197a79d34d65ca44e9c77f2571edbcfb64b.tar.gz lwn-6f834197a79d34d65ca44e9c77f2571edbcfb64b.zip | |
[AVR32] Fix bogus pte_page() definition
The current definition of pte_page() masks out valid bits from the
physical address, causing vmalloc_to_page() to misbehave. This may
lead to everything from mmap() silently accessing the wrong data to
"invalid pte" errors dumped by the kernel.
Also remove the now-unused definition of PTE_PHYS_MASK.
Thanks to Matteo Vit for discovering this bug.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'include/asm-avr32')
| -rw-r--r-- | include/asm-avr32/pgtable.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-avr32/pgtable.h b/include/asm-avr32/pgtable.h index c07bdd10b891..018f6e2a0242 100644 --- a/include/asm-avr32/pgtable.h +++ b/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 |