From: Max Filippov <jcmvbkbc@gmail.com>
Date: Fri, 6 Jul 2012 14:54:06 +0000 (+0400)
Subject: xtensa/PCI: fix WT caching attribute
X-Git-Tag: next-20120816~78^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3c13f031ae69423b84072e482f3478c7baae788f;p=karo-tx-linux.git

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>
---

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;