summaryrefslogtreecommitdiffstats
path: root/sys/ofed
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-03-27 14:24:29 +0000
committerjhb <jhb@FreeBSD.org>2012-03-27 14:24:29 +0000
commit9fc8d42e62520327401d5e4d47a5f915bd81e4e4 (patch)
tree867685497b868f6bdc582271762f2f723cb56aaf /sys/ofed
parent4d91f78223dc434eb86fb079f5dbabed9a16eb79 (diff)
downloadFreeBSD-src-9fc8d42e62520327401d5e4d47a5f915bd81e4e4.zip
FreeBSD-src-9fc8d42e62520327401d5e4d47a5f915bd81e4e4.tar.gz
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).
Diffstat (limited to 'sys/ofed')
-rw-r--r--sys/ofed/include/linux/io.h2
-rw-r--r--sys/ofed/include/linux/page.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/ofed/include/linux/io.h b/sys/ofed/include/linux/io.h
index 5405be7..f1686f7 100644
--- a/sys/ofed/include/linux/io.h
+++ b/sys/ofed/include/linux/io.h
@@ -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
diff --git a/sys/ofed/include/linux/page.h b/sys/ofed/include/linux/page.h
index 0c9052c..9e15201 100644
--- a/sys/ofed/include/linux/page.h
+++ b/sys/ofed/include/linux/page.h
@@ -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
OpenPOWER on IntegriCloud