Merge remote-tracking branch 'lsk/v3.10/topic/hrtimer' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / xtensa / kernel / pci.c

diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 54354de38a706f0f5e72bb2661f6f768c9fcae3b..126c18839409cbc1d19af546f6884f431f2b5f83 100644 (file)
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -333,7 +333,7 @@ __pci_mmap_set_pgprot(struct pci_dev *dev, struct vm_area_struct *vma,
        int prot = pgprot_val(vma->vm_page_prot);
 
        /* Set to write-through */
-       prot &= ~_PAGE_NO_CACHE;
+       prot = (prot & _PAGE_CA_MASK) | _PAGE_CA_WT;
 #if 0
        if (!write_combine)
                prot |= _PAGE_WRITETHRU;