svn commit: r224372 - stable/7/sys/sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Mon Jul 25 18:43:24 2011
New Revision: 224372
URL: http://svn.freebsd.org/changeset/base/224372

Log:
  MFC: r223720
  
  Don't waste a delay slot.

Modified:
  stable/7/sys/sparc64/sparc64/mp_exception.S
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/sparc64/mp_exception.S
==============================================================================
--- stable/7/sys/sparc64/sparc64/mp_exception.S	Mon Jul 25 18:42:45 2011	(r224371)
+++ stable/7/sys/sparc64/sparc64/mp_exception.S	Mon Jul 25 18:43:24 2011	(r224372)
@@ -235,8 +235,8 @@ ENTRY(tl_ipi_tlb_range_demap)
 	ldx	[%g5 + ITA_START], %g1
 	ldx	[%g5 + ITA_END], %g2
 
-1:	or	%g1, %g3, %g4
 	sethi	%hi(KERNBASE), %g6
+1:	or	%g1, %g3, %g4
 	stxa	%g0, [%g4] ASI_DMMU_DEMAP
 	stxa	%g0, [%g4] ASI_IMMU_DEMAP
 	flush	%g6
@@ -245,7 +245,7 @@ ENTRY(tl_ipi_tlb_range_demap)
 	add	%g1, %g6, %g1
 	cmp	%g1, %g2
 	blt,a,pt %xcc, 1b
-	 nop
+	 sethi	%hi(KERNBASE), %g6
 
 	IPI_DONE(%g5, %g1, %g2, %g3)
 	retry