---

yaml --- r: 136714 b: refs/heads/master c: 327641d h: refs/heads/master v: v3
git-mirror · Feb 5, 2009 · a5e3ddd · a5e3ddd
1 parent d427caf
commit a5e3ddd
Show file tree

Hide file tree

Showing 16 changed files with 1,191 additions and 933 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef3892bd63420380d115f755d351d2071f1f805f
+refs/heads/master: 327641da8e3e227f42690479182b896fd19486be
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 native_pte_flags(pte_t pte)
+static inline pteval_t pte_flags(pte_t pte)
 {
 	return native_pte_val(pte) & PTE_FLAGS_MASK;
 }
@@ -173,7 +173,6 @@ static inline pteval_t native_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 */