aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/pgtable_32.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:32:57 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:32:57 -0500
commit38472311679d8784c2934d071ddda23d9b3fe264 (patch)
tree3d37cfad15dc767dfb7033b9366e09dd24bbef53 /include/asm-x86/pgtable_32.h
parent6fdc05d4794056e0b98901646c4b68c60a01d5eb (diff)
x86: unify pgtable accessors which use, #2
based on: Subject: x86: unify pgtable accessors which use supported_pte_mask From: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/pgtable_32.h')
-rw-r--r--include/asm-x86/pgtable_32.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index 0aaefdda5158..109dad5e16ee 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -235,22 +235,6 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
235 235
236#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) 236#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
237 237
238static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
239{
240 pte.pte_low &= _PAGE_CHG_MASK;
241 pte.pte_low |= pgprot_val(newprot);
242#ifdef CONFIG_X86_PAE
243 /*
244 * Chop off the NX bit (if present), and add the NX portion of
245 * the newprot (if present):
246 */
247 pte.pte_high &= ~(1 << (_PAGE_BIT_NX - 32));
248 pte.pte_high |= (pgprot_val(newprot) >> 32) & \
249 (__supported_pte_mask >> 32);
250#endif
251 return pte;
252}
253
254/* 238/*
255 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] 239 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
256 * 240 *