Date: Tue, 27 Mar 2012 14:24:30 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233547 - head/sys/ofed/include/linux Message-ID: <201203271424.q2REOUEY089545@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203271424.q2REOUEY089545>