From owner-svn-src-head@freebsd.org Thu Jan 23 03:38:41 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9534D22A852; Thu, 23 Jan 2020 03:38:41 +0000 (UTC) (envelope-from cy@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 4837KY3TNdz3yjK; Thu, 23 Jan 2020 03:38:41 +0000 (UTC) (envelope-from cy@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 729D185F4; Thu, 23 Jan 2020 03:38:41 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00N3cfTT009436; Thu, 23 Jan 2020 03:38:41 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00N3cfmA009435; Thu, 23 Jan 2020 03:38:41 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202001230338.00N3cfmA009435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 23 Jan 2020 03:38:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357016 - head/sys/x86/cpufreq X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sys/x86/cpufreq X-SVN-Commit-Revision: 357016 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.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2020 03:38:41 -0000 Author: cy Date: Thu Jan 23 03:38:41 2020 New Revision: 357016 URL: https://svnweb.freebsd.org/changeset/base/357016 Log: Fix 32-bit build post r357002. Modified: head/sys/x86/cpufreq/hwpstate_intel.c Modified: head/sys/x86/cpufreq/hwpstate_intel.c ============================================================================== --- head/sys/x86/cpufreq/hwpstate_intel.c Thu Jan 23 03:37:35 2020 (r357015) +++ head/sys/x86/cpufreq/hwpstate_intel.c Thu Jan 23 03:38:41 2020 (r357016) @@ -140,10 +140,10 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) } rdmsr_safe(MSR_IA32_HWP_CAPABILITIES, &data); - sbuf_printf(sb, "\tHighest Performance: %03lu\n", data & 0xff); - sbuf_printf(sb, "\tGuaranteed Performance: %03lu\n", (data >> 8) & 0xff); - sbuf_printf(sb, "\tEfficient Performance: %03lu\n", (data >> 16) & 0xff); - sbuf_printf(sb, "\tLowest Performance: %03lu\n", (data >> 24) & 0xff); + sbuf_printf(sb, "\tHighest Performance: %03ju\n", data & 0xff); + sbuf_printf(sb, "\tGuaranteed Performance: %03ju\n", (data >> 8) & 0xff); + sbuf_printf(sb, "\tEfficient Performance: %03ju\n", (data >> 16) & 0xff); + sbuf_printf(sb, "\tLowest Performance: %03ju\n", (data >> 24) & 0xff); rdmsr_safe(MSR_IA32_HWP_REQUEST, &data); if (sc->hwp_pkg_ctrl && (data & IA32_HWP_REQUEST_PACKAGE_CONTROL)) { @@ -154,9 +154,9 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) #define pkg_print(x, name, offset) do { \ if (!sc->hwp_pkg_ctrl || (data & x) != 0) \ - sbuf_printf(sb, "\t%s: %03lu\n", name, (data >> offset) & 0xff);\ + sbuf_printf(sb, "\t%s: %03ju\n", name, (data >> offset) & 0xff);\ else \ - sbuf_printf(sb, "\t%s: %03lu\n", name, (data2 >> offset) & 0xff);\ + sbuf_printf(sb, "\t%s: %03ju\n", name, (data2 >> offset) & 0xff);\ } while (0) pkg_print(IA32_HWP_REQUEST_EPP_VALID,