diff options
author | jhb <jhb@FreeBSD.org> | 2012-03-29 16:51:22 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2012-03-29 16:51:22 +0000 |
commit | 98fa920cd519a461bb15b9a966b79df86f036f15 (patch) | |
tree | 7cc06366966422b271fcd99947cc78471c614d3a | |
parent | 42c95c38919ca89dda8cabd3e43b847c44271613 (diff) | |
download | FreeBSD-src-98fa920cd519a461bb15b9a966b79df86f036f15.zip FreeBSD-src-98fa920cd519a461bb15b9a966b79df86f036f15.tar.gz |
- 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.
-rw-r--r-- | sys/amd64/include/vm.h | 2 | ||||
-rw-r--r-- | sys/i386/include/vm.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/vm.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sys/amd64/include/vm.h b/sys/amd64/include/vm.h index 4065a36..6573e37 100644 --- a/sys/amd64/include/vm.h +++ b/sys/amd64/include/vm.h @@ -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 diff --git a/sys/i386/include/vm.h b/sys/i386/include/vm.h index 4065a36..6573e37 100644 --- a/sys/i386/include/vm.h +++ b/sys/i386/include/vm.h @@ -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 diff --git a/sys/powerpc/include/vm.h b/sys/powerpc/include/vm.h index 4c4d7cf..ed7757e 100644 --- a/sys/powerpc/include/vm.h +++ b/sys/powerpc/include/vm.h @@ -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 |