lkml.org 
[lkml]   [2012]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] ARM: dma-mapping: fix leak in consistent_init
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 <ajeet.yadav.77@gmail.com>
> ---
> 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.


\
 
 \ /
  Last update: 2012-02-17 14:15    [W:0.046 / U:4.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site