From owner-svn-src-head@FreeBSD.ORG  Tue Mar 27 14:24:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6BAAE106566B;
	Tue, 27 Mar 2012 14:24:30 +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 569F28FC0C;
	Tue, 27 Mar 2012 14:24:30 +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 q2REOUSi089548;
	Tue, 27 Mar 2012 14:24:30 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2REOUEY089545;
	Tue, 27 Mar 2012 14:24:30 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201203271424.q2REOUEY089545@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 27 Mar 2012 14:24:30 +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: r233547 - head/sys/ofed/include/linux
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Mar 2012 14:24:30 -0000

Author: jhb
Date: Tue Mar 27 14:24:29 2012
New Revision: 233547
URL: http://svn.freebsd.org/changeset/base/233547

Log:
  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:
  head/sys/ofed/include/linux/io.h
  head/sys/ofed/include/linux/page.h

Modified: head/sys/ofed/include/linux/io.h
==============================================================================
--- head/sys/ofed/include/linux/io.h	Tue Mar 27 14:10:15 2012	(r233546)
+++ head/sys/ofed/include/linux/io.h	Tue Mar 27 14:24:29 2012	(r233547)
@@ -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: head/sys/ofed/include/linux/page.h
==============================================================================
--- head/sys/ofed/include/linux/page.h	Tue Mar 27 14:10:15 2012	(r233546)
+++ head/sys/ofed/include/linux/page.h	Tue Mar 27 14:24:29 2012	(r233547)
@@ -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