Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e8a4852453c5af27d2a9c606e76809afa3dedb64
Commit:     e8a4852453c5af27d2a9c606e76809afa3dedb64
Parent:     7d00a1ae54779db1bec03fa575cf53d99cb6cc48
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:32:56 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:32:56 2008 +0100

    x86/pgtable: unify pagetable accessors, #5
    
    reorder. NOP.
    
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 include/asm-x86/pgtable_32.h |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index b3e9212..1c43c30 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -108,28 +108,23 @@ extern unsigned long pg0[];
 static inline int pte_dirty(pte_t pte)         { return pte_val(pte) & 
_PAGE_DIRTY; }
 static inline int pte_young(pte_t pte)         { return pte_val(pte) & 
_PAGE_ACCESSED; }
 static inline int pte_write(pte_t pte)         { return pte_val(pte) & 
_PAGE_RW; }
+static inline int pte_file(pte_t pte)          { return pte_val(pte) & 
_PAGE_FILE; }
 static inline int pte_huge(pte_t pte)          { return pte_val(pte) & 
_PAGE_PSE; }
 
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)          { return pte_val(pte) & 
_PAGE_FILE; }
+static inline int pmd_large(pmd_t pte) {
+       return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==
+               (_PAGE_PSE|_PAGE_PRESENT);
+}
 
 static inline pte_t pte_mkclean(pte_t pte)     { return __pte(pte_val(pte) & 
~_PAGE_DIRTY); }
 static inline pte_t pte_mkold(pte_t pte)       { return __pte(pte_val(pte) & 
~_PAGE_ACCESSED); }
 static inline pte_t pte_wrprotect(pte_t pte)   { return __pte(pte_val(pte) & 
~_PAGE_RW); }
+static inline pte_t pte_mkexec(pte_t pte)      { return __pte(pte_val(pte) & 
~_PAGE_NX); }
 static inline pte_t pte_mkdirty(pte_t pte)     { return __pte(pte_val(pte) | 
_PAGE_DIRTY); }
 static inline pte_t pte_mkyoung(pte_t pte)     { return __pte(pte_val(pte) | 
_PAGE_ACCESSED); }
 static inline pte_t pte_mkwrite(pte_t pte)     { return __pte(pte_val(pte) | 
_PAGE_RW); }
 static inline pte_t pte_mkhuge(pte_t pte)      { return __pte(pte_val(pte) | 
_PAGE_PSE); }
-
 static inline pte_t pte_clrhuge(pte_t pte)     { return __pte(pte_val(pte) & 
~_PAGE_PSE); }
-static inline pte_t pte_mkexec(pte_t pte)      { return __pte(pte_val(pte) & 
~_PAGE_NX); }
-
-static inline int pmd_large(pmd_t pte) {
-       return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==
-               (_PAGE_PSE|_PAGE_PRESENT);
-}
 
 #ifdef CONFIG_X86_PAE
 # include <asm/pgtable-3level.h>
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to