From owner-svn-src-head@FreeBSD.ORG Tue Apr 30 16:10:19 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A00EFCFE; Tue, 30 Apr 2013 16:10:19 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-we0-x22d.google.com (mail-we0-x22d.google.com [IPv6:2a00:1450:400c:c03::22d]) by mx1.freebsd.org (Postfix) with ESMTP id C8D021C54; Tue, 30 Apr 2013 16:10:18 +0000 (UTC) Received: by mail-we0-f173.google.com with SMTP id o7so565286wea.32 for ; Tue, 30 Apr 2013 09:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=nowYmetMoTsV+e6sfNaDoaKe30OMj36abn0VrMNb9sY=; b=mtPAP7jBDAP3chqjgl88qeczClgPxCl/TfjAzNaMZwjTycdsCaanuYkkfYdwB3PTYa BuO4seL20XJrgS7SRjU3/yUsxwys6qVY3OKOx/HucWOPCDqBWHKyfKM+YZrs1G8pi0b2 xC4COLqa6JewQ9wyPt9TDX36JtD/Mv8bsJHBUwcYCWsdwIj9dsil1Y1PyhBnvgWhKNjI cncZ000cWkJMPlfUoDioC/1i/ml7CFxI85m0KB0pu6bH4ExluTuF318pMQTzgpJD6nuF 1PvMhcQk745Zm8SkMNmhvdSRSqDA64ilB3j3sCCgY0+Yg6QFy5kwyJwFNRzdZ0uDy87E oLUQ== MIME-Version: 1.0 X-Received: by 10.180.183.50 with SMTP id ej18mr25639597wic.4.1367338217875; Tue, 30 Apr 2013 09:10:17 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.194.29.199 with HTTP; Tue, 30 Apr 2013 09:10:17 -0700 (PDT) In-Reply-To: <201304301559.r3UFxM88094038@svn.freebsd.org> References: <201304301559.r3UFxM88094038@svn.freebsd.org> Date: Tue, 30 Apr 2013 20:10:17 +0400 X-Google-Sender-Auth: ME8zOrcBWu6-cf8vyU2t1AVD1gk Message-ID: Subject: Re: svn commit: r250105 - head/sys/dev/hwpmc From: Sergey Kandaurov To: Davide Italiano Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2013 16:10:19 -0000 Hi. On 30 April 2013 19:59, Davide Italiano 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