x86: Use new cache mode type in asm/pgtable.h

[cascardo/linux.git] / arch / x86 / include / asm / pgtable.h

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index aa97a07..c112ea6 100644 (file)
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -9,9 +9,10 @@
 /*
  * Macro to mark a page protection value as UC-
  */
-#define pgprot_noncached(prot)                                 \
-       ((boot_cpu_data.x86 > 3)                                \
-        ? (__pgprot(pgprot_val(prot) | _PAGE_CACHE_UC_MINUS))  \
+#define pgprot_noncached(prot)                                         \
+       ((boot_cpu_data.x86 > 3)                                        \
+        ? (__pgprot(pgprot_val(prot) |                                 \
+                    cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS)))     \
         : (prot))
 
 #ifndef __ASSEMBLY__
@@ -404,8 +405,8 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
 #define canon_pgprot(p) __pgprot(massage_pgprot(p))
 
 static inline int is_new_memtype_allowed(u64 paddr, unsigned long size,
-                                        unsigned long flags,
-                                        unsigned long new_flags)
+                                        enum page_cache_mode pcm,
+                                        enum page_cache_mode new_pcm)
 {
        /*
         * PAT type is always WB for untracked ranges, so no need to check.
@@ -419,10 +420,10 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size,
         * - request is uncached, return cannot be write-back
         * - request is write-combine, return cannot be write-back
         */
-       if ((flags == _PAGE_CACHE_UC_MINUS &&
-            new_flags == _PAGE_CACHE_WB) ||
-           (flags == _PAGE_CACHE_WC &&
-            new_flags == _PAGE_CACHE_WB)) {
+       if ((pcm == _PAGE_CACHE_MODE_UC_MINUS &&
+            new_pcm == _PAGE_CACHE_MODE_WB) ||
+           (pcm == _PAGE_CACHE_MODE_WC &&
+            new_pcm == _PAGE_CACHE_MODE_WB)) {
                return 0;
        }