summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2012-09-17 05:44:33 +0400
committerChris Zankel <chris@zankel.net>2012-10-03 15:11:13 -0700
commit2e6ee5ec88dd9d4d4e934709200259538160039d (patch)
treebad91316a924581ca08198e2a950c0b57d6f6a5d /arch/xtensa
parent6aebb64ad415c7d63ad4db5b401f960fe7b1d972 (diff)
downloadlinux-stable-2e6ee5ec88dd9d4d4e934709200259538160039d.tar.gz
linux-stable-2e6ee5ec88dd9d4d4e934709200259538160039d.tar.bz2
linux-stable-2e6ee5ec88dd9d4d4e934709200259538160039d.zip
xtensa/PCI: fix WT caching attribute
Fix caching attributes setup providing correct _PAGE_CA_* names. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 69759e9cb3ea..43e9fdce40d6 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -341,7 +341,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;