From owner-svn-src-head@freebsd.org  Fri Sep  8 01:06:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AB1CE1CC78;
 Fri,  8 Sep 2017 01:06:37 +0000 (UTC) (envelope-from cem@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 mx1.freebsd.org (Postfix) with ESMTPS id AD590642F1;
 Fri,  8 Sep 2017 01:06:36 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8816Z9h041335;
 Fri, 8 Sep 2017 01:06:35 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8816ZsY041334;
 Fri, 8 Sep 2017 01:06:35 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201709080106.v8816ZsY041334@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Fri, 8 Sep 2017 01:06:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323295 - head/sys/x86/x86
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/sys/x86/x86
X-SVN-Commit-Revision: 323295
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 01:06:37 -0000

Author: cem
Date: Fri Sep  8 01:06:35 2017
New Revision: 323295
URL: https://svnweb.freebsd.org/changeset/base/323295

Log:
  mca: Fix printf types from r323289 on i386
  
  Reported by:	Michael Butler <imb AT protected-networks.net>
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/x86/x86/mca.c

Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c	Fri Sep  8 00:11:58 2017	(r323294)
+++ head/sys/x86/x86/mca.c	Fri Sep  8 01:06:35 2017	(r323295)
@@ -982,13 +982,14 @@ amd_thresholding_init(void)
 	misc = rdmsr(MSR_MC_MISC(MC_AMDNB_BANK));
 	if ((misc & (MC_MISC_AMDNB_VAL | MC_MISC_AMDNB_CNTP)) !=
 	    (MC_MISC_AMDNB_VAL | MC_MISC_AMDNB_CNTP)) {
-		printf("%s: 0x%lx: !valid | !present\n", __func__, misc);
+		printf("%s: 0x%jx: !valid | !present\n", __func__,
+		    (uintmax_t)misc);
 		return;
 	}
 
 	/* The register should not be locked. */
 	if ((misc & MC_MISC_AMDNB_LOCK) != 0) {
-		printf("%s: 0x%lx: locked\n", __func__, misc);
+		printf("%s: 0x%jx: locked\n", __func__, (uintmax_t)misc);
 		return;
 	}
 
@@ -997,7 +998,8 @@ amd_thresholding_init(void)
 	 * has already claimed it.
 	 */
 	if ((misc & MC_MISC_AMDNB_CNTEN) != 0) {
-		printf("%s: 0x%lx: count already enabled\n", __func__, misc);
+		printf("%s: 0x%jx: count already enabled\n", __func__,
+		    (uintmax_t)misc);
 		return;
 	}