From owner-svn-src-all@FreeBSD.ORG  Thu Jun 17 20:53:56 2010
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 9E8091065674;
	Thu, 17 Jun 2010 20:53:56 +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 8D95C8FC1C;
	Thu, 17 Jun 2010 20:53:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5HKrukn046344;
	Thu, 17 Jun 2010 20:53:56 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5HKruU3046342;
	Thu, 17 Jun 2010 20:53:56 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201006172053.o5HKruU3046342@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 17 Jun 2010 20:53:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209272 - releng/8.1/sys/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, 17 Jun 2010 20:53:56 -0000

Author: marius
Date: Thu Jun 17 20:53:56 2010
New Revision: 209272
URL: http://svn.freebsd.org/changeset/base/209272

Log:
  MFC: r209138
  
  Update a branch missed in r207537 (committed to stable/8 in r207890).
  
  Approved by:	re (kib)

Modified:
  releng/8.1/sys/sparc64/sparc64/mp_locore.S
Directory Properties:
  releng/8.1/sys/   (props changed)
  releng/8.1/sys/amd64/include/xen/   (props changed)
  releng/8.1/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.1/sys/contrib/dev/acpica/   (props changed)
  releng/8.1/sys/contrib/pf/   (props changed)
  releng/8.1/sys/dev/xen/xenpci/   (props changed)
  releng/8.1/sys/geom/sched/   (props changed)

Modified: releng/8.1/sys/sparc64/sparc64/mp_locore.S
==============================================================================
--- releng/8.1/sys/sparc64/sparc64/mp_locore.S	Thu Jun 17 20:38:18 2010	(r209271)
+++ releng/8.1/sys/sparc64/sparc64/mp_locore.S	Thu Jun 17 20:53:56 2010	(r209272)
@@ -207,7 +207,7 @@ ENTRY(mp_startup)
 	bl	%icc, 2f
 	 nop
 	cmp	%l1, CPU_IMPL_ULTRASPARCIII
-	bl	%icc, 3f
+	bl	%icc, 4f
 	 nop
 2:	mov	CPU_STICKSYNC, %l2
 	membar	#StoreLoad