From owner-svn-src-all@FreeBSD.ORG  Mon Apr 23 08:58:02 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 96A531065670;
	Mon, 23 Apr 2012 08:58:02 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 822FE8FC0A;
	Mon, 23 Apr 2012 08:58:02 +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 q3N8w22a083137;
	Mon, 23 Apr 2012 08:58:02 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3N8w2A8083134;
	Mon, 23 Apr 2012 08:58:02 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201204230858.q3N8w2A8083134@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Mon, 23 Apr 2012 08:58:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234598 - head/sys/dev/hwpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2012 08:58:02 -0000

Author: fabient
Date: Mon Apr 23 08:58:01 2012
New Revision: 234598
URL: http://svn.freebsd.org/changeset/base/234598

Log:
  Fix class malloc init for mips and powerpc that was not converted
  by r233628.
  
  Found by: monthadar, adrian
  MFC after:	1 week

Modified:
  head/sys/dev/hwpmc/hwpmc_mips.c
  head/sys/dev/hwpmc/hwpmc_powerpc.c

Modified: head/sys/dev/hwpmc/hwpmc_mips.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_mips.c	Mon Apr 23 07:15:15 2012	(r234597)
+++ head/sys/dev/hwpmc/hwpmc_mips.c	Mon Apr 23 08:58:01 2012	(r234598)
@@ -431,11 +431,9 @@ pmc_mips_initialize()
 			   M_WAITOK|M_ZERO);
 
 	/* Just one class */
-	pmc_mdep = malloc(sizeof(struct pmc_mdep) + sizeof(struct pmc_classdep),
-			  M_PMC, M_WAITOK|M_ZERO);
+	pmc_mdep = pmc_mdep_alloc(1);
 
 	pmc_mdep->pmd_cputype = mips_pmc_spec.ps_cputype;
-	pmc_mdep->pmd_nclass  = 1;
 
 	pcd = &pmc_mdep->pmd_classdep[PMC_MDEP_CLASS_INDEX_MIPS];
 	pcd->pcd_caps  = mips_pmc_spec.ps_capabilities;

Modified: head/sys/dev/hwpmc/hwpmc_powerpc.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_powerpc.c	Mon Apr 23 07:15:15 2012	(r234597)
+++ head/sys/dev/hwpmc/hwpmc_powerpc.c	Mon Apr 23 08:58:01 2012	(r234598)
@@ -803,11 +803,9 @@ pmc_md_initialize()
 			   M_WAITOK|M_ZERO);
 
 	/* Just one class */
-	pmc_mdep = malloc(sizeof(struct pmc_mdep) + sizeof(struct pmc_classdep),
-			  M_PMC, M_WAITOK|M_ZERO);
+	pmc_mdep = pmc_mdep_alloc(1);
 
 	pmc_mdep->pmd_cputype = PMC_CPU_PPC_7450;
-	pmc_mdep->pmd_nclass  = 1;
 
 	pcd = &pmc_mdep->pmd_classdep[PMC_MDEP_CLASS_INDEX_PPC7450];
 	pcd->pcd_caps  = POWERPC_PMC_CAPS;