Hi. On 30 April 2013 19:59, Davide Italiano <dav...@freebsd.org> wrote: > Author: davide > Date: Tue Apr 30 15:59:22 2013 > New Revision: 250105 > URL: http://svnweb.freebsd.org/changeset/base/250105 > > Log: > malloc(9) cannot return NULL if M_WAITOK flag is specified. > > Modified: > head/sys/dev/hwpmc/hwpmc_mod.c > head/sys/dev/hwpmc/hwpmc_soft.c > > Modified: head/sys/dev/hwpmc/hwpmc_mod.c > ============================================================================== > --- head/sys/dev/hwpmc/hwpmc_mod.c Tue Apr 30 15:38:31 2013 > (r250104) > +++ head/sys/dev/hwpmc/hwpmc_mod.c Tue Apr 30 15:59:22 2013 > (r250105) > @@ -2210,11 +2210,8 @@ pmc_allocate_pmc_descriptor(void) > struct pmc *pmc; > > pmc = malloc(sizeof(struct pmc), M_PMC, M_WAITOK|M_ZERO); > - > - if (pmc != NULL) { > - pmc->pm_owner = NULL; > - LIST_INIT(&pmc->pm_targets); > - } > + pmc->pm_owner = NULL; > + LIST_INIT(&pmc->pm_targets); > > PMCDBG(PMC,ALL,1, "allocate-pmc -> pmc=%p", pmc); >
It looks like zeroing pm_owner can also be omitted with M_ZERO. -- wbr, pluknet _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
