Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / arch / x86 / mm / pat_internal.h

diff --git a/arch/x86/mm/pat_internal.h b/arch/x86/mm/pat_internal.h
index 77e5ba1..f641162 100644 (file)
--- a/arch/x86/mm/pat_internal.h
+++ b/arch/x86/mm/pat_internal.h
@@ -10,30 +10,32 @@ struct memtype {
        u64                     start;
        u64                     end;
        u64                     subtree_max_end;
-       unsigned long           type;
+       enum page_cache_mode    type;
        struct rb_node          rb;
 };
 
-static inline char *cattr_name(unsigned long flags)
+static inline char *cattr_name(enum page_cache_mode pcm)
 {
-       switch (flags & _PAGE_CACHE_MASK) {
-       case _PAGE_CACHE_UC:            return "uncached";
-       case _PAGE_CACHE_UC_MINUS:      return "uncached-minus";
-       case _PAGE_CACHE_WB:            return "write-back";
-       case _PAGE_CACHE_WC:            return "write-combining";
-       default:                        return "broken";
+       switch (pcm) {
+       case _PAGE_CACHE_MODE_UC:               return "uncached";
+       case _PAGE_CACHE_MODE_UC_MINUS:         return "uncached-minus";
+       case _PAGE_CACHE_MODE_WB:               return "write-back";
+       case _PAGE_CACHE_MODE_WC:               return "write-combining";
+       case _PAGE_CACHE_MODE_WT:               return "write-through";
+       case _PAGE_CACHE_MODE_WP:               return "write-protected";
+       default:                                return "broken";
        }
 }
 
 #ifdef CONFIG_X86_PAT
 extern int rbt_memtype_check_insert(struct memtype *new,
-                                       unsigned long *new_type);
+                                       enum page_cache_mode *new_type);
 extern struct memtype *rbt_memtype_erase(u64 start, u64 end);
 extern struct memtype *rbt_memtype_lookup(u64 addr);
 extern int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos);
 #else
 static inline int rbt_memtype_check_insert(struct memtype *new,
-                                       unsigned long *new_type)
+                                       enum page_cache_mode *new_type)
 { return 0; }
 static inline struct memtype *rbt_memtype_erase(u64 start, u64 end)
 { return NULL; }