---

yaml --- r: 136706 b: refs/heads/master c: 3ac6cff h: refs/heads/master v: v3
git-mirror · Jan 30, 2009 · 3b07cab · 3b07cab
1 parent ba39975
commit 3b07cab
Show file tree

Hide file tree

Showing 17 changed files with 950 additions and 1,196 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f4f931501e9270c156d05ee76b7b872de486304
+refs/heads/master: 3ac6cffea4aa18007a454a7442da2855882f403d
diff --git a/trunk/arch/x86/include/asm/page.h b/trunk/arch/x86/include/asm/page.h
@@ -147,7 +147,7 @@ static inline pteval_t native_pte_val(pte_t pte)
 	return pte.pte;
 }
 
-static inline pteval_t pte_flags(pte_t pte)
+static inline pteval_t native_pte_flags(pte_t pte)
 {
 	return native_pte_val(pte) & PTE_FLAGS_MASK;
 }
@@ -173,6 +173,7 @@ static inline pteval_t pte_flags(pte_t pte)
 #endif
 
 #define pte_val(x)	native_pte_val(x)
+#define pte_flags(x)	native_pte_flags(x)
 #define __pte(x)	native_make_pte(x)
 
 #endif	/* CONFIG_PARAVIRT */