diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index add5040064c4..ff1cfb36a966 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.4 1997/03/13 17:14:45 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.5 1997/03/16 09:40:01 thorpej Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -212,12 +212,6 @@ define	CLKSR			CLKSR
 define	CLKMSB1			CLKMSB1
 define	CLKMSB3			CLKMSB3
 
-# HP-UX trace bit
-# XXX This is used in a btst; the old genassym.c used
-# XXX	ffs(MDP_HPUXTRACE) - 1
-# XXX This translates to "2" for a value of 0x0004
-define	MDP_TRCB		2
-
 # LED stuff
 define	LED_PULSE		LED_PULSE
 define	LED_DISK		LED_DISK
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index 1635e8ff5415..3cdb5f8293ad 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.65 1997/03/15 23:23:55 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.66 1997/03/16 09:40:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -780,21 +780,16 @@ Ltrap1:
 	rte
 
 /*
- * Routines for traps 1 and 2.  The meaning of the two traps depends
- * on whether we are an HPUX compatible process or a native 4.3 process.
- * Our native 4.3 implementation uses trap 1 as sigreturn() and trap 2
- * as a breakpoint trap.  HPUX uses trap 1 for a breakpoint, so we have
- * to make adjustments so that trap 2 is used for sigreturn.
+ * Trap 1 - sigreturn
  */
 _trap1:
-	btst	#MDP_TRCB,mdpflag	| being traced by an HPUX process?
-	jeq	sigreturn		| no, trap1 is sigreturn
-	jra	_trace			| yes, trap1 is breakpoint
+	jra	sigreturn
 
+/*
+ * Trap 2 - trace trap
+ */
 _trap2:
-	btst	#MDP_TRCB,mdpflag	| being traced by an HPUX process?
-	jeq	_trace			| no, trap2 is breakpoint
-	jra	sigreturn		| yes, trap2 is sigreturn
+	jra	_trace
 
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c
index 1904642602d2..da3520ee396d 100644
--- a/sys/arch/hp300/hp300/vm_machdep.c
+++ b/sys/arch/hp300/hp300/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.32 1997/03/15 23:40:25 thorpej Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.33 1997/03/16 09:40:03 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -78,7 +78,7 @@ cpu_fork(p1, p2)
 	extern struct pcb *curpcb;
 	extern void proc_trampoline(), child_return();
 
-	p2->p_md.md_flags = p1->p_md.md_flags & ~MDP_HPUXTRACE;
+	p2->p_md.md_flags = p1->p_md.md_flags;
 
 	/* Sync curpcb (which is presumably p1's PCB) and copy it to p2. */
 	savectx(curpcb);
diff --git a/sys/arch/hp300/include/proc.h b/sys/arch/hp300/include/proc.h
index 5eb1cad8d9cd..79f9a375bbea 100644
--- a/sys/arch/hp300/include/proc.h
+++ b/sys/arch/hp300/include/proc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.6 1994/10/26 07:26:35 cgd Exp $	*/
+/*	$NetBSD: proc.h,v 1.7 1997/03/16 09:41:36 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -44,7 +44,6 @@ struct mdproc {
 };
 
 /* md_flags */
-#define	MDP_HPUXTRACE	0x0004	/* being traced by HP-UX process */
 #define	MDP_HPUXMMAP	0x0008	/* VA space is multiply mapped */
 #define MDP_CCBDATA	0x0010	/* copyback caching of data (68040) */
 #define MDP_CCBSTACK	0x0020	/* copyback caching of stack (68040) */