Author: jhb
Date: Thu Apr 12 13:46:56 2012
New Revision: 234179
URL: http://svn.freebsd.org/changeset/base/234179
Log:
MFC 233670,233671:
- Use VM_MEMATTR_UNCACHEABLE for the constant for UC memory rather than
VM_MEMATTR_UNCACHED on mips.
- Rename VM_MEMATTR_UNCACHED to VM_MEMATTR_WEAK_UNCACHEABLE on x86 to
be less ambiguous and more clearly identify what it means. An alias
from VM_MEMATTR_WEAK_UNCACHEABLE to VM_MEMATTR_WEAK_UNCACHED remains
on x86 to preserve the KPI.
- Remove the VM_MEMATTR_UNCACHED alias from powerpc.
Modified:
stable/9/sys/amd64/include/vm.h
stable/9/sys/i386/include/vm.h
stable/9/sys/mips/include/vm.h
stable/9/sys/powerpc/include/vm.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/amd64/include/vm.h
==============================================================================
--- stable/9/sys/amd64/include/vm.h Thu Apr 12 13:43:43 2012
(r234178)
+++ stable/9/sys/amd64/include/vm.h Thu Apr 12 13:46:56 2012
(r234179)
@@ -38,7 +38,8 @@
#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_UNCACHED VM_MEMATTR_WEAK_UNCACHEABLE
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
Modified: stable/9/sys/i386/include/vm.h
==============================================================================
--- stable/9/sys/i386/include/vm.h Thu Apr 12 13:43:43 2012
(r234178)
+++ stable/9/sys/i386/include/vm.h Thu Apr 12 13:46:56 2012
(r234179)
@@ -38,7 +38,8 @@
#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_UNCACHED VM_MEMATTR_WEAK_UNCACHEABLE
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
Modified: stable/9/sys/mips/include/vm.h
==============================================================================
--- stable/9/sys/mips/include/vm.h Thu Apr 12 13:43:43 2012
(r234178)
+++ stable/9/sys/mips/include/vm.h Thu Apr 12 13:46:56 2012
(r234179)
@@ -32,7 +32,7 @@
#include <machine/pte.h>
/* Memory attributes. */
-#define VM_MEMATTR_UNCACHED ((vm_memattr_t)PTE_C_UNCACHED)
+#define VM_MEMATTR_UNCACHEABLE ((vm_memattr_t)PTE_C_UNCACHED)
#define VM_MEMATTR_DEFAULT ((vm_memattr_t)PTE_C_CACHE)
#endif /* !_MACHINE_VM_H_ */
Modified: stable/9/sys/powerpc/include/vm.h
==============================================================================
--- stable/9/sys/powerpc/include/vm.h Thu Apr 12 13:43:43 2012
(r234178)
+++ stable/9/sys/powerpc/include/vm.h Thu Apr 12 13:46:56 2012
(r234179)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
