x86: Use new cache mode type in mm/ioremap.c

Instead of directly using the cache mode bits in the pte switch to
using the cache mode type.

Based-on-patch-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stefan.bader@canonical.com
Cc: xen-devel@lists.xensource.com
Cc: konrad.wilk@oracle.com
Cc: ville.syrjala@linux.intel.com
Cc: david.vrabel@citrix.com
Cc: jbeulich@suse.com
Cc: toshi.kani@hp.com
Cc: plagnioj@jcrosoft.com
Cc: tomi.valkeinen@ti.com
Cc: bhelgaas@google.com
Link: http://lkml.kernel.org/r/1415019724-4317-13-git-send-email-jgross@suse.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 7 insertions, 5 deletions

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 2f3744fdc741..8f68a83491ba 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -462,7 +462,7 @@ int io_reserve_memtype(resource_size_t start, resource_size_t end,
         if (!is_new_memtype_allowed(start, size, req_type, new_type))
                 goto out_free;
 
-        if (kernel_map_sync_memtype(start, size, new_prot) < 0)
+        if (kernel_map_sync_memtype(start, size, new_type) < 0)
                 goto out_free;
 
         *type = new_type;
@@ -560,7 +560,8 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
  * Change the memory type for the physial address range in kernel identity
  * mapping space if that range is a part of identity map.
  */
-int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
+int kernel_map_sync_memtype(u64 base, unsigned long size,
+                            enum page_cache_mode pcm)
 {
         unsigned long id_sz;
 
@@ -578,11 +579,11 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
                                 __pa(high_memory) - base :
                                 size;
 
-        if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
+        if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
                 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
                         "for [mem %#010Lx-%#010Lx]\n",
                         current->comm, current->pid,
-                        cattr_name(flags),
+                        cattr_name(cachemode2protval(pcm)),
                         base, (unsigned long long)(base + size-1));
                 return -EINVAL;
         }
@@ -656,7 +657,8 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
                                      flags);
         }
 
-        if (kernel_map_sync_memtype(paddr, size, flags) < 0) {
+        if (kernel_map_sync_memtype(paddr, size,
+                                    pgprot2cachemode(__pgprot(flags))) < 0) {
                 free_memtype(paddr, paddr + size);
                 return -EINVAL;
         }