diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 008889d1ef47..b8b68abe6f73 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -149,6 +149,8 @@ void		install_extint(void (*)(void));
 
 int             setfault(faultbuf);             /* defined in locore.S */
 
+void		asm_panic(char *);
+
 long		Maxmem = 0;
 
 struct pmap	ofw_pmap;
@@ -239,17 +241,6 @@ extern void	*tlbdlmiss, *tlbdlmsize;
 extern void	*tlbdsmiss, *tlbdsmsize;
 extern void     *extint, *extsize;
 
-#if 0 /* XXX: interrupt handler.  We'll get to this later */
-extern void	ext_intr(void);
-#endif
-
-#ifdef DDB
-extern		ddblow, ddbsize;
-#endif
-#ifdef IPKDB
-extern		ipkdblow, ipkdbsize;
-#endif
-
 void
 powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
 {
@@ -784,3 +775,8 @@ casuptr(intptr_t *p, intptr_t old, intptr_t new)
 	return (-1);
 }
 
+void
+asm_panic(char *pstr)
+{
+	panic(pstr);
+}
diff --git a/sys/powerpc/aim/trap_subr.S b/sys/powerpc/aim/trap_subr.S
index 624272f55e75..f8656677617b 100644
--- a/sys/powerpc/aim/trap_subr.S
+++ b/sys/powerpc/aim/trap_subr.S
@@ -594,7 +594,7 @@ CNAME(ipkdbsize) = .-CNAME(ipkdblow)
 	bne	cr4,2f;							\
 	lis	3,cpassert@ha;		/* if it is, panic */		\
 	addi	3,3,cpassert@l;						\
-	b	panic;							\
+	b	asm_panic;						\
 2:	lwz	3,PM_SR+0(2);						\
 	mtsr	0,3;			/* restore SR0 */		\
 	lwz	3,PM_SR+4(2);						\
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index 008889d1ef47..b8b68abe6f73 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -149,6 +149,8 @@ void		install_extint(void (*)(void));
 
 int             setfault(faultbuf);             /* defined in locore.S */
 
+void		asm_panic(char *);
+
 long		Maxmem = 0;
 
 struct pmap	ofw_pmap;
@@ -239,17 +241,6 @@ extern void	*tlbdlmiss, *tlbdlmsize;
 extern void	*tlbdsmiss, *tlbdsmsize;
 extern void     *extint, *extsize;
 
-#if 0 /* XXX: interrupt handler.  We'll get to this later */
-extern void	ext_intr(void);
-#endif
-
-#ifdef DDB
-extern		ddblow, ddbsize;
-#endif
-#ifdef IPKDB
-extern		ipkdblow, ipkdbsize;
-#endif
-
 void
 powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
 {
@@ -784,3 +775,8 @@ casuptr(intptr_t *p, intptr_t old, intptr_t new)
 	return (-1);
 }
 
+void
+asm_panic(char *pstr)
+{
+	panic(pstr);
+}
diff --git a/sys/powerpc/powerpc/trap_subr.S b/sys/powerpc/powerpc/trap_subr.S
index 624272f55e75..f8656677617b 100644
--- a/sys/powerpc/powerpc/trap_subr.S
+++ b/sys/powerpc/powerpc/trap_subr.S
@@ -594,7 +594,7 @@ CNAME(ipkdbsize) = .-CNAME(ipkdblow)
 	bne	cr4,2f;							\
 	lis	3,cpassert@ha;		/* if it is, panic */		\
 	addi	3,3,cpassert@l;						\
-	b	panic;							\
+	b	asm_panic;						\
 2:	lwz	3,PM_SR+0(2);						\
 	mtsr	0,3;			/* restore SR0 */		\
 	lwz	3,PM_SR+4(2);						\