svn commit: r234181 - in stable/9/sys: i386/conf kern ofed/include/linux

[John Baldwin]

Author: jhb
Date: Thu Apr 12 13:53:10 2012
New Revision: 234181
URL: http://svn.freebsd.org/changeset/base/234181

Log:
  MFC 233547:
  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:
  stable/9/sys/ofed/include/linux/io.h
  stable/9/sys/ofed/include/linux/page.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/ofed/include/linux/io.h
==============================================================================
--- stable/9/sys/ofed/include/linux/io.h	Thu Apr 12 13:47:23 2012	(r234180)
+++ stable/9/sys/ofed/include/linux/io.h	Thu Apr 12 13:53:10 2012	(r234181)
@@ -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: stable/9/sys/ofed/include/linux/page.h
==============================================================================
--- stable/9/sys/ofed/include/linux/page.h	Thu Apr 12 13:47:23 2012	(r234180)
+++ stable/9/sys/ofed/include/linux/page.h	Thu Apr 12 13:53:10 2012	(r234181)
@@ -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