diff options
Diffstat (limited to 'include/asm-x86/pgtable.h')
-rw-r--r-- | include/asm-x86/pgtable.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 97c271b2910b..47a852cb8c92 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
@@ -164,37 +164,37 @@ extern struct list_head pgd_list; | |||
164 | */ | 164 | */ |
165 | static inline int pte_dirty(pte_t pte) | 165 | static inline int pte_dirty(pte_t pte) |
166 | { | 166 | { |
167 | return pte_val(pte) & _PAGE_DIRTY; | 167 | return pte_flags(pte) & _PAGE_DIRTY; |
168 | } | 168 | } |
169 | 169 | ||
170 | static inline int pte_young(pte_t pte) | 170 | static inline int pte_young(pte_t pte) |
171 | { | 171 | { |
172 | return pte_val(pte) & _PAGE_ACCESSED; | 172 | return pte_flags(pte) & _PAGE_ACCESSED; |
173 | } | 173 | } |
174 | 174 | ||
175 | static inline int pte_write(pte_t pte) | 175 | static inline int pte_write(pte_t pte) |
176 | { | 176 | { |
177 | return pte_val(pte) & _PAGE_RW; | 177 | return pte_flags(pte) & _PAGE_RW; |
178 | } | 178 | } |
179 | 179 | ||
180 | static inline int pte_file(pte_t pte) | 180 | static inline int pte_file(pte_t pte) |
181 | { | 181 | { |
182 | return pte_val(pte) & _PAGE_FILE; | 182 | return pte_flags(pte) & _PAGE_FILE; |
183 | } | 183 | } |
184 | 184 | ||
185 | static inline int pte_huge(pte_t pte) | 185 | static inline int pte_huge(pte_t pte) |
186 | { | 186 | { |
187 | return pte_val(pte) & _PAGE_PSE; | 187 | return pte_flags(pte) & _PAGE_PSE; |
188 | } | 188 | } |
189 | 189 | ||
190 | static inline int pte_global(pte_t pte) | 190 | static inline int pte_global(pte_t pte) |
191 | { | 191 | { |
192 | return pte_val(pte) & _PAGE_GLOBAL; | 192 | return pte_flags(pte) & _PAGE_GLOBAL; |
193 | } | 193 | } |
194 | 194 | ||
195 | static inline int pte_exec(pte_t pte) | 195 | static inline int pte_exec(pte_t pte) |
196 | { | 196 | { |
197 | return !(pte_val(pte) & _PAGE_NX); | 197 | return !(pte_flags(pte) & _PAGE_NX); |
198 | } | 198 | } |
199 | 199 | ||
200 | static inline int pte_special(pte_t pte) | 200 | static inline int pte_special(pte_t pte) |
@@ -305,7 +305,7 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) | |||
305 | return __pgprot(preservebits | addbits); | 305 | return __pgprot(preservebits | addbits); |
306 | } | 306 | } |
307 | 307 | ||
308 | #define pte_pgprot(x) __pgprot(pte_val(x) & ~PTE_MASK) | 308 | #define pte_pgprot(x) __pgprot(pte_flags(x) & ~PTE_MASK) |
309 | 309 | ||
310 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) | 310 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) |
311 | 311 | ||