d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix i386 builds after r334005 and r334009

Browse Source 
r334005: add pc_ibpb_set as it is now referenced by common code
(although presumably not needed on i386 since it has been there
since the first spectre mitigation work on amd64)

r334009: there is no amd64 rflags -> i386 eflags
This commit is contained in:
mmacy 2018-05-22 05:09:33 +00:00
parent 1f9699a9eb
commit cb38945503
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/i386/i386/trap.c
View File

@ -338,7 +338,7 @@ trap(struct trapframe *frame)
ucode = TRAP_TRACE; ucode = TRAP_TRACE;
dr6 = rdr6(); dr6 = rdr6();
if (dr6 & DBREG_DR6_BS) if (dr6 & DBREG_DR6_BS)
frame->tf_rflags &= ~PSL_T; frame->tf_eflags &= ~PSL_T;
break; break;
case T_ARITHTRAP: /* arithmetic trap */ case T_ARITHTRAP: /* arithmetic trap */

3
sys/i386/include/pcpu.h
View File

@ -77,7 +77,8 @@
struct sx pc_copyout_slock; \ struct sx pc_copyout_slock; \
char *pc_copyout_buf; \ char *pc_copyout_buf; \
uint32_t pc_smp_tlb_done; /* TLB op acknowledgement */ \ uint32_t pc_smp_tlb_done; /* TLB op acknowledgement */ \
char __pad[550] uint32_t pc_ibpb_set; \
char __pad[546]
#ifdef _KERNEL #ifdef _KERNEL