From owner-p4-projects@FreeBSD.ORG  Sat Mar 15 19:52:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC34F1065672; Sat, 15 Mar 2008 19:52:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BEA51065670
	for <perforce@freebsd.org>; Sat, 15 Mar 2008 19:52:00 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 840688FC22
	for <perforce@freebsd.org>; Sat, 15 Mar 2008 19:52:00 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJq0kC065449
	for <perforce@freebsd.org>; Sat, 15 Mar 2008 19:52:00 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJq0qD065445
	for perforce@freebsd.org; Sat, 15 Mar 2008 19:52:00 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 15 Mar 2008 19:52:00 GMT
Message-Id: <200803151952.m2FJq0qD065445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Mar 2008 19:52:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=137796

Change 137796 by marcel@marcel_xcllnt on 2008/03/15 19:51:42

	Fix compile breakage (due to commit before compile).
	AP boots to the end, where we put it in an infinite loop.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#4 edit
.. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#19 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#4 (text+ko) ====

@@ -168,14 +168,12 @@
 	trcp[1] = 0;
 
 	pcpup->pc_curthread = pcpup->pc_idlethread;
-	pcpup->pc_curtcb = pcpup->pc_curthread->td_pcb;
+	pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb;
 	sp = pcpup->pc_curpcb->pcb_sp;
 
 	trcp[0] = 0x2003;
 	trcp[1] = sp;
 
-	breakpoint();
-
 	return (sp);
 }
 

==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#19 (text+ko) ====

@@ -236,7 +236,7 @@
 			break;
 		case IPI_STOP:
 			self = PCPU_GET(cpumask);
-			savectx(PCPU_PTR(pcb));
+			savectx(PCPU_GET(curpcb));
 			atomic_set_int(&stopped_cpus, self);
 			while ((started_cpus & self) == 0)
 				cpu_spinwait();