From owner-svn-src-projects@FreeBSD.ORG Tue May 10 13:49:34 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E6E701065672;
Tue, 10 May 2011 13:49:34 +0000 (UTC)
(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id D6EE98FC18;
Tue, 10 May 2011 13:49:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4ADnYcY046608;
Tue, 10 May 2011 13:49:34 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4ADnYaO046606;
Tue, 10 May 2011 13:49:34 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201105101349.p4ADnYaO046606@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 10 May 2011 13:49:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r221736 - projects/largeSMP/usr.sbin/pmccontrol
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2011 13:49:35 -0000
Author: attilio
Date: Tue May 10 13:49:34 2011
New Revision: 221736
URL: http://svn.freebsd.org/changeset/base/221736
Log:
Avoid breaking strict-aliasing.
Modified:
projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c
Modified: projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c
==============================================================================
--- projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c Tue May 10 13:48:21 2011 (r221735)
+++ projects/largeSMP/usr.sbin/pmccontrol/pmccontrol.c Tue May 10 13:49:34 2011 (r221736)
@@ -141,6 +141,7 @@ pmcc_do_enable_disable(struct pmcc_op_li
unsigned char *map;
unsigned char op;
int cpu, pmc;
+ size_t setsize;
if ((ncpu = pmc_ncpu()) < 0)
err(EX_OSERR, "Unable to determine the number of cpus");
@@ -152,8 +153,9 @@ pmcc_do_enable_disable(struct pmcc_op_li
"halted");
}
CPU_ZERO(&haltedcpus);
+ setsize = (size_t)cpusetsize;
if (ncpu > 1 && sysctlbyname("machdep.hlt_cpus", &haltedcpus,
- (size_t *)&cpusetsize, NULL, 0) < 0)
+ &setsize, NULL, 0) < 0)
err(EX_OSERR, "ERROR: Cannot determine which CPUs are "
"halted");
CPU_FILL(&cpumask);