svn commit: r233671 - in head/sys: amd64/include i386/include powerpc/include

John Baldwin jhb at FreeBSD.org
Thu Mar 29 16:51:23 UTC 2012


Author: jhb
Date: Thu Mar 29 16:51:22 2012
New Revision: 233671
URL: http://svn.freebsd.org/changeset/base/233671

Log:
  - Rename VM_MEMATTR_UNCACHED to VM_MEMATTR_WEAK_UNCACHEABLE on x86 to
    be less ambiguous and more clearly identify what it means.  This
    attribute is what Intel refers to as UC-, and it's only difference
    relative to normal UC memory is that a WC MTRR will override a UC-
    PAT entry causing the memory to be treated as WC, whereas a UC PAT
    entry will always override the MTRR.
  - Remove the VM_MEMATTR_UNCACHED alias from powerpc.

Modified:
  head/sys/amd64/include/vm.h
  head/sys/i386/include/vm.h
  head/sys/powerpc/include/vm.h

Modified: head/sys/amd64/include/vm.h
==============================================================================
--- head/sys/amd64/include/vm.h	Thu Mar 29 16:48:36 2012	(r233670)
+++ head/sys/amd64/include/vm.h	Thu Mar 29 16:51:22 2012	(r233671)
@@ -38,7 +38,7 @@
 #define	VM_MEMATTR_WRITE_THROUGH	((vm_memattr_t)PAT_WRITE_THROUGH)
 #define	VM_MEMATTR_WRITE_PROTECTED	((vm_memattr_t)PAT_WRITE_PROTECTED)
 #define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PAT_WRITE_BACK)
-#define	VM_MEMATTR_UNCACHED		((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_WEAK_UNCACHEABLE	((vm_memattr_t)PAT_UNCACHED)
 
 #define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
 

Modified: head/sys/i386/include/vm.h
==============================================================================
--- head/sys/i386/include/vm.h	Thu Mar 29 16:48:36 2012	(r233670)
+++ head/sys/i386/include/vm.h	Thu Mar 29 16:51:22 2012	(r233671)
@@ -38,7 +38,7 @@
 #define	VM_MEMATTR_WRITE_THROUGH	((vm_memattr_t)PAT_WRITE_THROUGH)
 #define	VM_MEMATTR_WRITE_PROTECTED	((vm_memattr_t)PAT_WRITE_PROTECTED)
 #define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PAT_WRITE_BACK)
-#define	VM_MEMATTR_UNCACHED		((vm_memattr_t)PAT_UNCACHED)
+#define	VM_MEMATTR_WEAK_UNCACHEABLE	((vm_memattr_t)PAT_UNCACHED)
 
 #define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
 

Modified: head/sys/powerpc/include/vm.h
==============================================================================
--- head/sys/powerpc/include/vm.h	Thu Mar 29 16:48:36 2012	(r233670)
+++ head/sys/powerpc/include/vm.h	Thu Mar 29 16:51:22 2012	(r233671)
@@ -34,7 +34,6 @@
 /* Memory attributes. */
 #define	VM_MEMATTR_DEFAULT		0
 #define	VM_MEMATTR_UNCACHEABLE		0x01
-#define	VM_MEMATTR_UNCACHED		VM_MEMATTR_UNCACHEABLE
 #define	VM_MEMATTR_CACHEABLE		0x02
 #define	VM_MEMATTR_WRITE_COMBINING	0x04
 #define	VM_MEMATTR_WRITE_BACK		0x08


More information about the svn-src-head mailing list