From owner-svn-src-all@FreeBSD.ORG  Thu Mar 19 13:24:48 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 D16D81065670;
	Thu, 19 Mar 2009 13:24:48 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE8F08FC13;
	Thu, 19 Mar 2009 13:24:48 +0000 (UTC)
	(envelope-from marius@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 n2JDOmnj062787;
	Thu, 19 Mar 2009 13:24:48 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JDOmIU062786;
	Thu, 19 Mar 2009 13:24:48 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200903191324.n2JDOmIU062786@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 19 Mar 2009 13:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190043 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb sparc64/sparc64
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: Thu, 19 Mar 2009 13:24:49 -0000

Author: marius
Date: Thu Mar 19 13:24:48 2009
New Revision: 190043
URL: http://svn.freebsd.org/changeset/base/190043

Log:
  MFC: r182774
  
  When determining whether we trapped while in the PROM don't only
  check for addresses below the PROM range but also those above.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/sparc64/sparc64/exception.S

Modified: stable/7/sys/sparc64/sparc64/exception.S
==============================================================================
--- stable/7/sys/sparc64/sparc64/exception.S	Thu Mar 19 13:18:28 2009	(r190042)
+++ stable/7/sys/sparc64/sparc64/exception.S	Thu Mar 19 13:24:48 2009	(r190043)
@@ -2738,6 +2738,10 @@ ENTRY(tl1_ret)
 	cmp	%l1, %l5
 	bl,a,pt	%xcc, 1f
 	 nop
+	set	VM_MAX_PROM_ADDRESS, %l5
+	cmp	%l1, %l5
+	bg,a,pt	%xcc, 1f
+	 nop
 
 	wrpr	%g0, PSTATE_NORMAL, %pstate