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