From owner-svn-src-all@FreeBSD.ORG Thu Mar 29 16:51:23 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9501E1065674; Thu, 29 Mar 2012 16:51:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 66C968FC1D; Thu, 29 Mar 2012 16:51:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2TGpN0V002023; Thu, 29 Mar 2012 16:51:23 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2TGpNNo002019; Thu, 29 Mar 2012 16:51:23 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201203291651.q2TGpNNo002019@svn.freebsd.org> From: John Baldwin Date: Thu, 29 Mar 2012 16:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233671 - in head/sys: amd64/include i386/include powerpc/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2012 16:51:23 -0000 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