diff --git a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
index f2815bb76c2..209732e9cbd 100644
--- a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
@@ -125,7 +125,8 @@ static CORE_ADDR pcpu;
  * Symbol names of kernel entry points.  Use special frames.
  */
 #define	KSYM_TRAP	"calltrap"
-#define	KSYM_INTERRUPT	"Xresume"
+#define	KSYM_INTR	"Xintr"
+#define	KSYM_FASTINTR	"Xfastintr"
 #define	KSYM_SYSCALL	"Xsyscall"
 
 /*
@@ -160,7 +161,9 @@ struct frame_info *fr;
        if (sym != NULL) {
                if (strcmp (SYMBOL_NAME(sym), KSYM_TRAP) == 0)
                        frametype = tf_trap;
-               else if (strncmp (SYMBOL_NAME(sym), KSYM_INTERRUPT, 7) == 0)
+               else if (strncmp (SYMBOL_NAME(sym), KSYM_INTR,
+                   strlen(KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym),
+                   KSYM_FASTINTR, strlen(KSYM_FASTINTR)) == 0)
                        frametype = tf_interrupt;
                else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0)
                        frametype = tf_syscall;
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
index f2815bb76c2..209732e9cbd 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
@@ -125,7 +125,8 @@ static CORE_ADDR pcpu;
  * Symbol names of kernel entry points.  Use special frames.
  */
 #define	KSYM_TRAP	"calltrap"
-#define	KSYM_INTERRUPT	"Xresume"
+#define	KSYM_INTR	"Xintr"
+#define	KSYM_FASTINTR	"Xfastintr"
 #define	KSYM_SYSCALL	"Xsyscall"
 
 /*
@@ -160,7 +161,9 @@ struct frame_info *fr;
        if (sym != NULL) {
                if (strcmp (SYMBOL_NAME(sym), KSYM_TRAP) == 0)
                        frametype = tf_trap;
-               else if (strncmp (SYMBOL_NAME(sym), KSYM_INTERRUPT, 7) == 0)
+               else if (strncmp (SYMBOL_NAME(sym), KSYM_INTR,
+                   strlen(KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym),
+                   KSYM_FASTINTR, strlen(KSYM_FASTINTR)) == 0)
                        frametype = tf_interrupt;
                else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0)
                        frametype = tf_syscall;
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 8096d3c5385..3d7a687de3f 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -155,8 +155,6 @@ IDTVEC(vec_name) ;							\
 	movl	PCPU(CURTHREAD),%ebx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ;				\
 ;	 								\
-  /* entry point used by doreti_unpend for HWIs. */			\
-__CONCAT(Xresume,irq_num): ;						\
 	FAKE_MCOUNT(13*4(%esp)) ;		/* XXX avoid dbl cnt */ \
 	pushl	$irq_num;			/* pass the IRQ */	\
 	call	sched_ithd ;						\
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 3a07050cba0..a4539a0f820 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -223,7 +223,8 @@ db_nextframe(fp, ip, p)
 	if (name != NULL) {
 		if (!strcmp(name, "calltrap")) {
 			frame_type = TRAP;
-		} else if (!strncmp(name, "Xresume", 7)) {
+		} else if (!strncmp(name, "Xintr", 5) ||
+		    !strncmp(name, "Xfastintr", 9)) {
 			frame_type = INTERRUPT;
 		} else if (!strcmp(name, "syscall_with_err_pushed")) {
 			frame_type = SYSCALL;
diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S
index 3a42af48297..bd38dda0982 100644
--- a/sys/amd64/isa/atpic_vector.S
+++ b/sys/amd64/isa/atpic_vector.S
@@ -106,7 +106,6 @@ IDTVEC(vec_name) ; \
 	enable_icus ; \
 	movl	PCPU(CURTHREAD),%ebx ; \
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ; \
-__CONCAT(Xresume,irq_num): ; \
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
 	pushl	$irq_num; 	/* pass the IRQ */ \
 	call	sched_ithd ; \
diff --git a/sys/amd64/isa/icu_vector.S b/sys/amd64/isa/icu_vector.S
index 3a42af48297..bd38dda0982 100644
--- a/sys/amd64/isa/icu_vector.S
+++ b/sys/amd64/isa/icu_vector.S
@@ -106,7 +106,6 @@ IDTVEC(vec_name) ; \
 	enable_icus ; \
 	movl	PCPU(CURTHREAD),%ebx ; \
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ; \
-__CONCAT(Xresume,irq_num): ; \
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
 	pushl	$irq_num; 	/* pass the IRQ */ \
 	call	sched_ithd ; \
diff --git a/sys/amd64/isa/icu_vector.s b/sys/amd64/isa/icu_vector.s
index 3a42af48297..bd38dda0982 100644
--- a/sys/amd64/isa/icu_vector.s
+++ b/sys/amd64/isa/icu_vector.s
@@ -106,7 +106,6 @@ IDTVEC(vec_name) ; \
 	enable_icus ; \
 	movl	PCPU(CURTHREAD),%ebx ; \
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ; \
-__CONCAT(Xresume,irq_num): ; \
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
 	pushl	$irq_num; 	/* pass the IRQ */ \
 	call	sched_ithd ; \
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index 8096d3c5385..3d7a687de3f 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -155,8 +155,6 @@ IDTVEC(vec_name) ;							\
 	movl	PCPU(CURTHREAD),%ebx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ;				\
 ;	 								\
-  /* entry point used by doreti_unpend for HWIs. */			\
-__CONCAT(Xresume,irq_num): ;						\
 	FAKE_MCOUNT(13*4(%esp)) ;		/* XXX avoid dbl cnt */ \
 	pushl	$irq_num;			/* pass the IRQ */	\
 	call	sched_ithd ;						\
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 3a07050cba0..a4539a0f820 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -223,7 +223,8 @@ db_nextframe(fp, ip, p)
 	if (name != NULL) {
 		if (!strcmp(name, "calltrap")) {
 			frame_type = TRAP;
-		} else if (!strncmp(name, "Xresume", 7)) {
+		} else if (!strncmp(name, "Xintr", 5) ||
+		    !strncmp(name, "Xfastintr", 9)) {
 			frame_type = INTERRUPT;
 		} else if (!strcmp(name, "syscall_with_err_pushed")) {
 			frame_type = SYSCALL;
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 8096d3c5385..3d7a687de3f 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -155,8 +155,6 @@ IDTVEC(vec_name) ;							\
 	movl	PCPU(CURTHREAD),%ebx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ;				\
 ;	 								\
-  /* entry point used by doreti_unpend for HWIs. */			\
-__CONCAT(Xresume,irq_num): ;						\
 	FAKE_MCOUNT(13*4(%esp)) ;		/* XXX avoid dbl cnt */ \
 	pushl	$irq_num;			/* pass the IRQ */	\
 	call	sched_ithd ;						\
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index 3a42af48297..bd38dda0982 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -106,7 +106,6 @@ IDTVEC(vec_name) ; \
 	enable_icus ; \
 	movl	PCPU(CURTHREAD),%ebx ; \
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ; \
-__CONCAT(Xresume,irq_num): ; \
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
 	pushl	$irq_num; 	/* pass the IRQ */ \
 	call	sched_ithd ; \
diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s
index 3a42af48297..bd38dda0982 100644
--- a/sys/i386/isa/icu_vector.s
+++ b/sys/i386/isa/icu_vector.s
@@ -106,7 +106,6 @@ IDTVEC(vec_name) ; \
 	enable_icus ; \
 	movl	PCPU(CURTHREAD),%ebx ; \
 	incl	TD_INTR_NESTING_LEVEL(%ebx) ; \
-__CONCAT(Xresume,irq_num): ; \
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
 	pushl	$irq_num; 	/* pass the IRQ */ \
 	call	sched_ithd ; \