From owner-svn-src-head@FreeBSD.ORG  Fri Nov 23 04:28:14 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 5058FB39;
 Fri, 23 Nov 2012 04:28:14 +0000 (UTC)
 (envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 352EA8FC08;
 Fri, 23 Nov 2012 04:28:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAN4SELC036197;
 Fri, 23 Nov 2012 04:28:14 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAN4SEeN036196;
 Fri, 23 Nov 2012 04:28:14 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201211230428.qAN4SEeN036196@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 23 Nov 2012 04:28:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243422 - head/sys/dev/gxemul/cons
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 23 Nov 2012 04:28:14 -0000

Author: jmallett
Date: Fri Nov 23 04:28:13 2012
New Revision: 243422
URL: http://svnweb.freebsd.org/changeset/base/243422

Log:
  Use MIPS_PHYS_TO_DIRECT_UNCACHED rather than a homegrown version which is not
  compatible with 32-bit kernels.

Modified:
  head/sys/dev/gxemul/cons/gxemul_cons.c

Modified: head/sys/dev/gxemul/cons/gxemul_cons.c
==============================================================================
--- head/sys/dev/gxemul/cons/gxemul_cons.c	Fri Nov 23 03:34:12 2012	(r243421)
+++ head/sys/dev/gxemul/cons/gxemul_cons.c	Fri Nov 23 04:28:13 2012	(r243422)
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$");
 
 #include <ddb/ddb.h>
 
+#include <machine/cpuregs.h>
+
 #define	GC_LOCK_INIT()		mtx_init(&gc_lock, "gc_lock", NULL, MTX_SPIN)
 
 #define	GC_LOCK() do {							\
@@ -97,8 +99,6 @@ static void		gxemul_cons_timeout(void *)
  * XXXRW: Should be using FreeBSD's bus routines here, but they are not
  * available until later in the boot.
  */
-#define	MIPS_XKPHYS_UNCACHED_BASE	0x9000000000000000
-
 typedef	uint64_t	paddr_t;
 typedef	uint64_t	vaddr_t;
 
@@ -106,7 +106,7 @@ static inline vaddr_t
 mips_phys_to_uncached(paddr_t phys)            
 {
 
-	return (phys | MIPS_XKPHYS_UNCACHED_BASE);
+	return (MIPS_PHYS_TO_DIRECT_UNCACHED(phys));
 }
 
 static inline uint8_t