From owner-svn-src-projects@FreeBSD.ORG  Mon Mar 29 16:22:09 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 69C811065672;
	Mon, 29 Mar 2010 16:22:09 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58E368FC26;
	Mon, 29 Mar 2010 16:22:09 +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 o2TGM9mP007025;
	Mon, 29 Mar 2010 16:22:09 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2TGM94W007024;
	Mon, 29 Mar 2010 16:22:09 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003291622.o2TGM94W007024@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 29 Mar 2010 16:22:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205840 - projects/ppc64/sys/boot/powerpc/ps3
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Mar 2010 16:22:09 -0000

Author: nwhitehorn
Date: Mon Mar 29 16:22:09 2010
New Revision: 205840
URL: http://svn.freebsd.org/changeset/base/205840

Log:
  Fix two obvious bugs.

Modified:
  projects/ppc64/sys/boot/powerpc/ps3/start.S

Modified: projects/ppc64/sys/boot/powerpc/ps3/start.S
==============================================================================
--- projects/ppc64/sys/boot/powerpc/ps3/start.S	Mon Mar 29 16:14:22 2010	(r205839)
+++ projects/ppc64/sys/boot/powerpc/ps3/start.S	Mon Mar 29 16:22:09 2010	(r205840)
@@ -56,11 +56,12 @@ secondary_spin_sem:
 	.long	0
 
 . = 0x60
-thread1_start:
+thread1_start_kboot:
 	ba	thread1_start	/* kboot copies the first 256 bytes to
 				 * address 0, so we are safe to jump
 				 * (and stay) there */
 
+thread1_start:
 	li	%r0,secondary_spin_sem@l
 1:	lwz	%r1,0(%r0)	/* Spin on SECONDARY_SPIN_SEM_ADDRESS */
 	cmpwi	%r1,0
@@ -93,8 +94,8 @@ relocate_self:
 	blt	1b
 
 	/* Now invalidate the icache */
-2:	li	%r5,0
-	dcbst	0,%r5
+	li	%r5,0
+2:	dcbst	0,%r5
 	icbi	0,%r5
 	cmpw	%r5,%r8
 	addi	%r5,%r5,CACHELINE_SIZE