Author: jhb
Date: Tue Mar 27 14:24:29 2012
New Revision: 233547
URL: http://svn.freebsd.org/changeset/base/233547
Log:
Use VM_MEMATTR_UNCACHEABLE instead of VM_MEMATTR_UNCACHED for UC mappings.
VM_MEMATTR_UNCACHED is actually the x86-specific UC- mode (where a WC
MTRR can override the PAT setting).
Modified:
head/sys/ofed/include/linux/io.h
head/sys/ofed/include/linux/page.h
Modified: head/sys/ofed/include/linux/io.h
==============================================================================
--- head/sys/ofed/include/linux/io.h Tue Mar 27 14:10:15 2012
(r233546)
+++ head/sys/ofed/include/linux/io.h Tue Mar 27 14:24:29 2012
(r233547)
@@ -90,7 +90,7 @@ writew(uint16_t b, void *addr)
void *_ioremap_attr(vm_paddr_t phys_addr, unsigned long size, int attr);
#define ioremap_nocache(addr, size)
\
- _ioremap_attr((addr), (size), VM_MEMATTR_UNCACHED)
+ _ioremap_attr((addr), (size), VM_MEMATTR_UNCACHEABLE)
#define ioremap_wc(addr, size)
\
_ioremap_attr((addr), (size), VM_MEMATTR_WRITE_COMBINING)
#define ioremap ioremap_nocache
Modified: head/sys/ofed/include/linux/page.h
==============================================================================
--- head/sys/ofed/include/linux/page.h Tue Mar 27 14:10:15 2012
(r233546)
+++ head/sys/ofed/include/linux/page.h Tue Mar 27 14:24:29 2012
(r233547)
@@ -40,7 +40,7 @@
#define virt_to_page(x) PHYS_TO_VM_PAGE(vtophys((x)))
#define clear_page(page) memset((page), 0, PAGE_SIZE)
-#define pgprot_noncached(prot) VM_MEMATTR_UNCACHED
+#define pgprot_noncached(prot) VM_MEMATTR_UNCACHEABLE
#define pgprot_writecombine(prot) VM_MEMATTR_WRITE_COMBINING
#undef PAGE_MASK
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
