Date: Wed, 15 May 2019 20:44:27 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> 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 Message-ID: <201905152044.x4FKiRKg044354@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905152044.x4FKiRKg044354>