Index: powerpc/aim/trap_subr64.S
===================================================================
--- powerpc/aim/trap_subr64.S	(revision 335514)
+++ powerpc/aim/trap_subr64.S	(working copy)
@@ -896,8 +896,8 @@
 	andi.	%r1,%r1,0xff00
 	mtsprg3	%r1
 
-	ld	%r1,TRAP_TOCBASE(0)		/* get new SP */
-	ld	%r1,TOC_REF(tmpstk)(%r1)
+	GET_TOCBASE(%r1)
+        ld      %r1,TOC_REF(tmpstk)(%r1)        /* get new SP */
 	addi	%r1,%r1,(TMPSTKSZ-48)
 
 	FRAME_SETUP(PC_DBSAVE)
Index: powerpc/include/kdb.h
===================================================================
--- powerpc/include/kdb.h	(revision 335514)
+++ powerpc/include/kdb.h	(working copy)
@@ -40,6 +40,8 @@
 void kdb_cpu_clear_singlestep(void);
 void kdb_cpu_set_singlestep(void);
 
+#define KDB_STOPPEDPCB(pc)      &stoppcbs[pc->pc_cpuid]
+
 static __inline void
 kdb_cpu_sync_icache(unsigned char *addr, size_t size)
 {
Index: powerpc/include/smp.h
===================================================================
--- powerpc/include/smp.h	(revision 335514)
+++ powerpc/include/smp.h	(working copy)
@@ -31,6 +31,8 @@
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
 
+#include <machine/pcb.h>
+
 #ifdef _KERNEL
 
 #define	IPI_AST			0
@@ -59,6 +61,10 @@
 void	cpudep_ap_setup(void);
 void	machdep_ap_bootstrap(void);
 
+
 #endif /* !LOCORE */
 #endif /* _KERNEL */
+
+extern struct pcb stoppcbs[];
+
 #endif /* !_MACHINE_SMP_H */