From owner-svn-src-all@freebsd.org Mon Jul 16 13:21:50 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 2A3FB102788C; Mon, 16 Jul 2018 13:21:50 +0000 (UTC) (envelope-from markj@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 CBDBB70F7C; Mon, 16 Jul 2018 13:21:49 +0000 (UTC) (envelope-from markj@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 AD1CB1D185; Mon, 16 Jul 2018 13:21:49 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6GDLnk9098669; Mon, 16 Jul 2018 13:21:49 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6GDLntY098668; Mon, 16 Jul 2018 13:21:49 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201807161321.w6GDLntY098668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 16 Jul 2018 13:21:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r336338 - stable/11/usr.sbin/cpucontrol X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/usr.sbin/cpucontrol X-SVN-Commit-Revision: 336338 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.27 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: Mon, 16 Jul 2018 13:21:50 -0000 Author: markj Date: Mon Jul 16 13:21:49 2018 New Revision: 336338 URL: https://svnweb.freebsd.org/changeset/base/336338 Log: MFC r336257, r336258, r336263: Use the MSR name. Modified: stable/11/usr.sbin/cpucontrol/amd10h.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/cpucontrol/amd10h.c ============================================================================== --- stable/11/usr.sbin/cpucontrol/amd10h.c Mon Jul 16 13:14:53 2018 (r336337) +++ stable/11/usr.sbin/cpucontrol/amd10h.c Mon Jul 16 13:21:49 2018 (r336338) @@ -129,7 +129,7 @@ amd10h_update(const char *dev, const char *path) } signature = idargs.data[0]; - msrargs.msr = 0x0000008b; + msrargs.msr = MSR_BIOS_SIGN; error = ioctl(devfd, CPUCTL_RDMSR, &msrargs); if (error < 0) { WARN(0, "ioctl(%s)", dev); @@ -285,7 +285,7 @@ amd10h_update(const char *dev, const char *path) fprintf(stderr, "done.\n"); } - msrargs.msr = 0x0000008b; + msrargs.msr = MSR_BIOS_SIGN; error = ioctl(devfd, CPUCTL_RDMSR, &msrargs); if (error < 0) { WARN(0, "ioctl(%s)", dev);