From owner-svn-src-releng@freebsd.org Wed May 15 20:44:28 2019 Return-Path: Delivered-To: svn-src-releng@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 515FB15A1C76; Wed, 15 May 2019 20:44:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E92A970E59; Wed, 15 May 2019 20:44:27 +0000 (UTC) (envelope-from kib@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 BD182EE3E; Wed, 15 May 2019 20:44:27 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4FKiRnC044355; Wed, 15 May 2019 20:44:27 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4FKiRKg044354; Wed, 15 May 2019 20:44:27 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201905152044.x4FKiRKg044354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 15 May 2019 20:44:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r347632 - releng/12.0/sys/i386/i386 X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/12.0/sys/i386/i386 X-SVN-Commit-Revision: 347632 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E92A970E59 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2019 20:44:28 -0000 Author: kib Date: Wed May 15 20:44:27 2019 New Revision: 347632 URL: https://svnweb.freebsd.org/changeset/base/347632 Log: Fix mismerge. Pointy hat to: kib Tested by: so (emaste, gtetlow) Approved by: so (emaste, gtetlow) Modified: releng/12.0/sys/i386/i386/initcpu.c Modified: releng/12.0/sys/i386/i386/initcpu.c ============================================================================== --- releng/12.0/sys/i386/i386/initcpu.c Wed May 15 20:01:41 2019 (r347631) +++ releng/12.0/sys/i386/i386/initcpu.c Wed May 15 20:44:27 2019 (r347632) @@ -745,7 +745,6 @@ initializecpu(void) cpu_fxsr = hw_instruction_sse = 1; } #if defined(PAE) || defined(PAE_TABLES) - hw_mds_recalculate(); if ((amd_feature & AMDID_NX) != 0) { uint64_t msr; @@ -755,6 +754,7 @@ initializecpu(void) elf32_nxstack = 1; } #endif + hw_mds_recalculate(); } void