From owner-svn-src-all@freebsd.org Tue May 22 05:09:34 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84CA7EE6CC2; Tue, 22 May 2018 05:09:34 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B7BA83080; Tue, 22 May 2018 05:09:34 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 089487914; Tue, 22 May 2018 05:09:34 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4M59Xuj051460; Tue, 22 May 2018 05:09:33 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M59Xp5051457; Tue, 22 May 2018 05:09:33 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805220509.w4M59Xp5051457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Tue, 22 May 2018 05:09:33 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head/sys/i386: i386 include X-SVN-Commit-Revision: 334018 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 05:09:34 -0000 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