diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 12a1316bd7e1..a1b912155ec5 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -338,7 +338,7 @@ trap(struct trapframe *frame)
 			ucode = TRAP_TRACE;
 			dr6 = rdr6();
 			if (dr6 & DBREG_DR6_BS)
-				frame->tf_rflags &= ~PSL_T;
+				frame->tf_eflags &= ~PSL_T;
 			break;
 
 		case T_ARITHTRAP:	/* arithmetic trap */
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 13154b138c5b..768ccee20c0d 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -77,7 +77,8 @@
 	struct	sx pc_copyout_slock;					\
 	char	*pc_copyout_buf;					\
 	uint32_t pc_smp_tlb_done;	/* TLB op acknowledgement */	\
-	char	__pad[550]
+	uint32_t pc_ibpb_set;						\
+	char	__pad[546]
 
 #ifdef _KERNEL