summaryrefslogtreecommitdiff
path: root/arch/csky/include/asm/pgtable.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-10-05 23:37:23 +0300
committerDavid S. Miller <davem@davemloft.net>2019-10-05 23:37:23 +0300
commit6f4c930e02355664d89c976eccea5d999a90de16 (patch)
treebc08932fbf43b9560ba5bde3284674054e3b56eb /arch/csky/include/asm/pgtable.h
parent26e0105550862a137eba701e2f4e3eeb343759e9 (diff)
parent2d00aee21a5d4966e086d98f9d710afb92fb14e8 (diff)
downloadlinux-6f4c930e02355664d89c976eccea5d999a90de16.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'arch/csky/include/asm/pgtable.h')
-rw-r--r--arch/csky/include/asm/pgtable.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h
index 0040b3a05b61..7c21985c60dc 100644
--- a/arch/csky/include/asm/pgtable.h
+++ b/arch/csky/include/asm/pgtable.h
@@ -258,6 +258,16 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
{
unsigned long prot = pgprot_val(_prot);
+ prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED | _PAGE_SO;
+
+ return __pgprot(prot);
+}
+
+#define pgprot_writecombine pgprot_writecombine
+static inline pgprot_t pgprot_writecombine(pgprot_t _prot)
+{
+ unsigned long prot = pgprot_val(_prot);
+
prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED;
return __pgprot(prot);