Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/tj/misc into core/percpu
git-mirror · Feb 5, 2009 · 69b745f · 69b745f
2 parents ef3892b + e4d0407
commit 69b745f
Show file tree

Hide file tree

Showing 21 changed files with 1,379 additions and 1,178 deletions.
diff --git a/arch/x86/include/asm/page.h b/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 */