From owner-svn-src-all@FreeBSD.ORG  Wed Apr  8 22:19:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B951F106564A;
	Wed,  8 Apr 2009 22:19:39 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BF3D8FC1B;
	Wed,  8 Apr 2009 22:19:39 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n38MJd5x079139;
	Wed, 8 Apr 2009 22:19:39 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n38MJdfX079138;
	Wed, 8 Apr 2009 22:19:39 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200904082219.n38MJdfX079138@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 8 Apr 2009 22:19:39 +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: r190860 - head/sys/dev/uart
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2009 22:19:40 -0000

Author: marcel
Date: Wed Apr  8 22:19:39 2009
New Revision: 190860
URL: http://svn.freebsd.org/changeset/base/190860

Log:
  Don't use pmap_kextact() when comparing bus handles for Book-E.
  We typically wire translation to devices with TLB1 entries and
  pmap_kextract() does not know about those and returns 0.  This
  causes false positives (read: all serial ports suddenly become
  the console).

Modified:
  head/sys/dev/uart/uart_cpu_powerpc.c

Modified: head/sys/dev/uart/uart_cpu_powerpc.c
==============================================================================
--- head/sys/dev/uart/uart_cpu_powerpc.c	Wed Apr  8 21:57:03 2009	(r190859)
+++ head/sys/dev/uart/uart_cpu_powerpc.c	Wed Apr  8 22:19:39 2009	(r190860)
@@ -55,7 +55,11 @@ bus_space_tag_t uart_bus_space_mem = &bs
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
+#ifdef MPC85XX
+	return ((b1->bsh == b2->bsh) ? 1 : 0);
+#else
 	return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0);
+#endif
 }
 
 #ifdef MPC85XX