Date: Tue, 22 May 2018 05:09:33 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334018 - in head/sys/i386: i386 include Message-ID: <201805220509.w4M59Xp5051457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Tue May 22 05:09:33 2018 New Revision: 334018 URL: https://svnweb.freebsd.org/changeset/base/334018 Log: fix i386 builds after r334005 and r334009 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 Modified: head/sys/i386/i386/trap.c head/sys/i386/include/pcpu.h Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Tue May 22 04:45:46 2018 (r334017) +++ head/sys/i386/i386/trap.c Tue May 22 05:09:33 2018 (r334018) @@ -338,7 +338,7 @@ user_trctrap_out: 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 */ Modified: head/sys/i386/include/pcpu.h ============================================================================== --- head/sys/i386/include/pcpu.h Tue May 22 04:45:46 2018 (r334017) +++ head/sys/i386/include/pcpu.h Tue May 22 05:09:33 2018 (r334018) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805220509.w4M59Xp5051457>