summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2014-11-03 14:01:53 +0100
committerThomas Gleixner <tglx@linutronix.de>2014-11-16 11:04:25 +0100
commitd85f33342a0f57acfbe078cdd0c4f590d5608bb7 (patch)
treed0174d088ccf991ca7f3d7340d6d170b85326d09 /arch/x86/mm/pat.c
parent2df58b6d35306e8dab48923c9fbe9e1ad17537e2 (diff)
downloadlinux-d85f33342a0f57acfbe078cdd0c4f590d5608bb7.tar.bz2
x86: Use new cache mode type in asm/pgtable.h
Instead of directly using the cache mode bits in the pte switch to using the cache mode type. This requires changing some callers of is_new_memtype_allowed() to be changed as well. 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-8-git-send-email-jgross@suse.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/pat.c')
-rw-r--r--arch/x86/mm/pat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 657438858e83..47282c273647 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -455,7 +455,9 @@ int io_reserve_memtype(resource_size_t start, resource_size_t end,
if (ret)
goto out_err;
- if (!is_new_memtype_allowed(start, size, req_type, new_type))
+ if (!is_new_memtype_allowed(start, size,
+ pgprot2cachemode(__pgprot(req_type)),
+ pgprot2cachemode(__pgprot(new_type))))
goto out_free;
if (kernel_map_sync_memtype(start, size, new_type) < 0)
@@ -630,7 +632,9 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
if (flags != want_flags) {
if (strict_prot ||
- !is_new_memtype_allowed(paddr, size, want_flags, flags)) {
+ !is_new_memtype_allowed(paddr, size,
+ pgprot2cachemode(__pgprot(want_flags)),
+ pgprot2cachemode(__pgprot(flags)))) {
free_memtype(paddr, paddr + size);
printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
" for [mem %#010Lx-%#010Lx], got %s\n",