svn commit: r320812 - head/sys/compat/linuxkpi/common/include/linux

[Mark Johnston]

Author: markj
Date: Sat Jul  8 19:22:29 2017
New Revision: 320812
URL: https://svnweb.freebsd.org/changeset/base/320812

Log:
  Fix the definitions of pgprot_{noncached,writecombine} after r316562.
  
  MFC after:	1 week

Modified:
  head/sys/compat/linuxkpi/common/include/linux/page.h

Modified: head/sys/compat/linuxkpi/common/include/linux/page.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/page.h	Sat Jul  8 18:53:02 2017	(r320811)
+++ head/sys/compat/linuxkpi/common/include/linux/page.h	Sat Jul  8 19:22:29 2017	(r320812)
@@ -76,8 +76,10 @@ pgprot2cachemode(pgprot_t prot)
 #define	nth_page(page,n)	pfn_to_page(page_to_pfn((page)) + (n))
 
 #define	clear_page(page)		memset((page), 0, PAGE_SIZE)
-#define	pgprot_noncached(prot)		((pgprot_t)VM_MEMATTR_UNCACHEABLE)
-#define	pgprot_writecombine(prot)	((pgprot_t)VM_MEMATTR_WRITE_COMBINING)
+#define	pgprot_noncached(prot)		\
+	((prot) | cachemode2protval(VM_MEMATTR_UNCACHEABLE))
+#define	pgprot_writecombine(prot)	\
+	((prot) | cachemode2protval(VM_MEMATTR_WRITE_COMBINING))
 
 #undef	PAGE_MASK
 #define	PAGE_MASK	(~(PAGE_SIZE-1))