[Xen-devel] [PATCH V6 05/18] x86: Use new cache mode type in arch/x86/pci

[Juergen Gross <jgross@xxxxxxxx>]

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@xxxxxxxxxxxxx>
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
 arch/x86/pci/i386.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 37c1435..9b18ef3 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -433,14 +433,14 @@ int pci_mmap_page_range(struct pci_dev *dev, struct 
vm_area_struct *vma,
                return -EINVAL;
 
        if (pat_enabled && write_combine)
-               prot |= _PAGE_CACHE_WC;
+               prot |= cachemode2protval(_PAGE_CACHE_MODE_WC);
        else if (pat_enabled || boot_cpu_data.x86 > 3)
                /*
                 * ioremap() and ioremap_nocache() defaults to UC MINUS for now.
                 * To avoid attribute conflicts, request UC MINUS here
                 * as well.
                 */
-               prot |= _PAGE_CACHE_UC_MINUS;
+               prot |= cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS);
 
        vma->vm_page_prot = __pgprot(prot);
 
-- 
1.8.4.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel