svn commit: r190043 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb sparc64/sparc64

[Marius Strobl]

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