Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752601Ab2BQN2g (ORCPT ); Fri, 17 Feb 2012 08:28:36 -0500 Received: from mail-vx0-f174.google.com ([209.85.220.174]:55173 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752526Ab2BQN2d convert rfc822-to-8bit (ORCPT ); Fri, 17 Feb 2012 08:28:33 -0500 MIME-Version: 1.0 In-Reply-To: <20120217131247.GN27825@n2100.arm.linux.org.uk> References: <1329484195-26361-1-git-send-email-ajeet.yadav.77@gmail.com> <20120217131247.GN27825@n2100.arm.linux.org.uk> Date: Fri, 17 Feb 2012 18:58:33 +0530 Message-ID: Subject: Re: [PATCH 2/2] ARM: dma-mapping: fix leak in consistent_init From: Ajeet Yadav To: Russell King - ARM Linux Cc: Jon Medhurst , Nicolas Pitre , Catalin Marinas , Sumit Bhattacharya , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2099 Lines: 49 thank you for kind review, but how can I resent the patch using same mail chain git send-email --smtp-encryption=tls --smtp-server=smtp.gmail.com --smtp-user=ajeet.yadav.77@gmail.com --smtp-server-port=587 --from "Ajeet Yadav " --to "Russell King " --to "Jon Medhurst " --to "Nicolas Pitre " --to "Catalin Marinas " --to "Sumit Bhattacharya " --to "linux-arm-kernel@lists.infradead.org" --to "linux-kernel@vger.kernel.org" 0002-ARM-dma-mapping-fix-leak-in-consistent_init.patch On Fri, Feb 17, 2012 at 6:42 PM, Russell King - ARM Linux wrote: > On Fri, Feb 17, 2012 at 06:39:55PM +0530, Ajeet Yadav wrote: >> Although the error in this case is unlikely, but logically >> if error occurs then we leak memory. >> >> Signed-off-by: Ajeet Yadav >> --- >>  arch/arm/mm/dma-mapping.c |   24 ++++++++++++------------ >>  1 files changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c >> index 04bfa76..b8cf062 100644 >> --- a/arch/arm/mm/dma-mapping.c >> +++ b/arch/arm/mm/dma-mapping.c >> @@ -161,7 +161,6 @@ static struct arm_vmregion_head consistent_head = { >>   */ >>  static int __init consistent_init(void) >>  { >> -     int ret = 0; >>       pgd_t *pgd; >>       pud_t *pud; >>       pmd_t *pmd; >> @@ -171,7 +170,7 @@ static int __init consistent_init(void) >>       unsigned long num_ptes = (CONSISTENT_END - base) >> PMD_SHIFT; >> >>       consistent_pte = kmalloc(num_ptes * sizeof(pte_t *), GFP_KERNEL); >> -     if (!consistent_pte) { >> +     if (unlikely(!consistent_pte)) { > > Please get rid of these unlikelys.  This really isn't a performance > critical path. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/