Date: Tue, 30 Apr 2013 20:10:17 +0400 From: Sergey Kandaurov <pluknet@freebsd.org> To: Davide Italiano <davide@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r250105 - head/sys/dev/hwpmc Message-ID: <CAE-mSO%2BbU39S6Go3NmzzgBzr81BUgtnzwH9Dt_-M2%2BG=7W0PFw@mail.gmail.com> In-Reply-To: <201304301559.r3UFxM88094038@svn.freebsd.org> References: <201304301559.r3UFxM88094038@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi. On 30 April 2013 19:59, Davide Italiano <davide@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSO%2BbU39S6Go3NmzzgBzr81BUgtnzwH9Dt_-M2%2BG=7W0PFw>