diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2017-07-08 19:22:29 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2017-07-08 19:22:29 +0000 |
| commit | e51dd47b0875041d29ea9a2d985bacffa9c6bfed (patch) | |
| tree | 6a95af56e99f29c7be745b0dcf97c8ab6d8b727f /sys/compat/linuxkpi/common/include/linux/page.h | |
| parent | aa2b6b4957447f2b079dfd03ef3cb81baca42340 (diff) | |
| download | src-e51dd47b0875041d29ea9a2d985bacffa9c6bfed.tar.gz src-e51dd47b0875041d29ea9a2d985bacffa9c6bfed.zip | |
Fix the definitions of pgprot_{noncached,writecombine} after r316562.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=320812
Diffstat (limited to 'sys/compat/linuxkpi/common/include/linux/page.h')
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/page.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h index a504bedef7bb..c4ba0389810c 100644 --- a/sys/compat/linuxkpi/common/include/linux/page.h +++ b/sys/compat/linuxkpi/common/include/linux/page.h @@ -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)) |