diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 2024c6b9c265..8a86965196d5 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.90 1997/04/07 06:45:15 peter Exp $
+ *	$Id: trap.c,v 1.91 1997/04/07 07:15:55 peter Exp $
  */
 
 /*
@@ -85,6 +85,8 @@
 #include "isa.h"
 #include "npx.h"
 
+extern struct i386tss common_tss;
+
 int (*pmath_emulate) __P((struct trapframe *));
 
 extern void trap __P((struct trapframe frame));
@@ -759,15 +761,11 @@ trap_fatal(frame)
 void
 dblfault_handler()
 {
-	struct pcb *pcb = curpcb;
-
-	if (pcb != NULL) {
-		printf("\nFatal double fault:\n");
-		printf("eip = 0x%x\n", pcb->pcb_eip);
-		printf("esp = 0x%x\n", pcb->pcb_esp);
-		printf("ebp = 0x%x\n", pcb->pcb_ebp);
-	}
 
+	printf("\nFatal double fault:\n");
+	printf("eip = 0x%x\n", common_tss.tss_eip);
+	printf("esp = 0x%x\n", common_tss.tss_esp);
+	printf("ebp = 0x%x\n", common_tss.tss_ebp);
 	panic("double fault");
 }
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 2024c6b9c265..8a86965196d5 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.90 1997/04/07 06:45:15 peter Exp $
+ *	$Id: trap.c,v 1.91 1997/04/07 07:15:55 peter Exp $
  */
 
 /*
@@ -85,6 +85,8 @@
 #include "isa.h"
 #include "npx.h"
 
+extern struct i386tss common_tss;
+
 int (*pmath_emulate) __P((struct trapframe *));
 
 extern void trap __P((struct trapframe frame));
@@ -759,15 +761,11 @@ trap_fatal(frame)
 void
 dblfault_handler()
 {
-	struct pcb *pcb = curpcb;
-
-	if (pcb != NULL) {
-		printf("\nFatal double fault:\n");
-		printf("eip = 0x%x\n", pcb->pcb_eip);
-		printf("esp = 0x%x\n", pcb->pcb_esp);
-		printf("ebp = 0x%x\n", pcb->pcb_ebp);
-	}
 
+	printf("\nFatal double fault:\n");
+	printf("eip = 0x%x\n", common_tss.tss_eip);
+	printf("esp = 0x%x\n", common_tss.tss_esp);
+	printf("ebp = 0x%x\n", common_tss.tss_ebp);
 	panic("double fault");
 }
 
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 2024c6b9c265..8a86965196d5 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.90 1997/04/07 06:45:15 peter Exp $
+ *	$Id: trap.c,v 1.91 1997/04/07 07:15:55 peter Exp $
  */
 
 /*
@@ -85,6 +85,8 @@
 #include "isa.h"
 #include "npx.h"
 
+extern struct i386tss common_tss;
+
 int (*pmath_emulate) __P((struct trapframe *));
 
 extern void trap __P((struct trapframe frame));
@@ -759,15 +761,11 @@ trap_fatal(frame)
 void
 dblfault_handler()
 {
-	struct pcb *pcb = curpcb;
-
-	if (pcb != NULL) {
-		printf("\nFatal double fault:\n");
-		printf("eip = 0x%x\n", pcb->pcb_eip);
-		printf("esp = 0x%x\n", pcb->pcb_esp);
-		printf("ebp = 0x%x\n", pcb->pcb_ebp);
-	}
 
+	printf("\nFatal double fault:\n");
+	printf("eip = 0x%x\n", common_tss.tss_eip);
+	printf("esp = 0x%x\n", common_tss.tss_esp);
+	printf("ebp = 0x%x\n", common_tss.tss_ebp);
 	panic("double fault");
 }