Index: sys/amd64/amd64/gdb_machdep.c
===================================================================
--- sys/amd64/amd64/gdb_machdep.c
+++ sys/amd64/amd64/gdb_machdep.c
@@ -136,7 +136,7 @@
 gdb_cpu_signal(int type, int code)
 {
 
-	switch (type & ~T_USER) {
+	switch (type) {
 	case T_BPTFLT: return (SIGTRAP);
 	case T_ARITHTRAP: return (SIGFPE);
 	case T_PROTFLT: return (SIGSEGV);
Index: sys/i386/i386/gdb_machdep.c
===================================================================
--- sys/i386/i386/gdb_machdep.c
+++ sys/i386/i386/gdb_machdep.c
@@ -100,7 +100,7 @@
 gdb_cpu_signal(int type, int code)
 {
 
-	switch (type & ~T_USER) {
+	switch (type) {
 	case T_BPTFLT: return (SIGTRAP);
 	case T_ARITHTRAP: return (SIGFPE);
 	case T_PROTFLT: return (SIGSEGV);
Index: sys/x86/include/trap.h
===================================================================
--- sys/x86/include/trap.h
+++ sys/x86/include/trap.h
@@ -66,7 +66,4 @@
 #define	T_RESERVED	30	/* reserved (unknown) */
 #define	T_DTRACE_RET	32	/* DTrace pid return */
 
-/* Trap's coming from user mode */
-#define	T_USER	0x100
-
 #endif /* !_MACHINE_TRAP_H_ */