diff options
| author | fabient <fabient@FreeBSD.org> | 2012-04-23 08:58:01 +0000 |
|---|---|---|
| committer | fabient <fabient@FreeBSD.org> | 2012-04-23 08:58:01 +0000 |
| commit | 76203b349f1d9e1bf92b5dc45b9ac5cc94872cf2 (patch) | |
| tree | 4b009f379207252155f070f6a15fd30b8b8466bc | |
| parent | bb98136ca267acfa6666aa63f7f1f7ce66cd1a02 (diff) | |
| download | FreeBSD-src-76203b349f1d9e1bf92b5dc45b9ac5cc94872cf2.zip FreeBSD-src-76203b349f1d9e1bf92b5dc45b9ac5cc94872cf2.tar.gz | |
Fix class malloc init for mips and powerpc that was not converted
by r233628.
Found by: monthadar, adrian
MFC after: 1 week
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_mips.c | 4 | ||||
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_powerpc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/hwpmc/hwpmc_mips.c b/sys/dev/hwpmc/hwpmc_mips.c index 8df27c9..68a81e0 100644 --- a/sys/dev/hwpmc/hwpmc_mips.c +++ b/sys/dev/hwpmc/hwpmc_mips.c @@ -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; diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index ccbcb2c..a54ee62 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -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; |
