From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx122.postini.com [74.125.245.122]) by kanga.kvack.org (Postfix) with SMTP id C3F2D6B0038 for ; Mon, 3 Jun 2013 11:39:40 -0400 (EDT) Received: by mail-pb0-f50.google.com with SMTP id wy17so5859147pbc.9 for ; Mon, 03 Jun 2013 08:39:40 -0700 (PDT) Message-ID: <51ACB8B6.60603@gmail.com> Date: Mon, 03 Jun 2013 23:39:34 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH] mm, vmalloc: Use clamp to simplify code Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: "linux-kernel@vger.kernel.org" , Linux MM From: Zhang Yanfei Signed-off-by: Zhang Yanfei --- mm/vmalloc.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d365724..2d7eb81 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1337,16 +1337,8 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, struct vm_struct *area; BUG_ON(in_interrupt()); - if (flags & VM_IOREMAP) { - int bit = fls(size); - - if (bit > IOREMAP_MAX_ORDER) - bit = IOREMAP_MAX_ORDER; - else if (bit < PAGE_SHIFT) - bit = PAGE_SHIFT; - - align = 1ul << bit; - } + if (flags & VM_IOREMAP) + align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER); size = PAGE_ALIGN(size); if (unlikely(!size)) -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758797Ab3FCPjn (ORCPT ); Mon, 3 Jun 2013 11:39:43 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:34192 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758696Ab3FCPjk (ORCPT ); Mon, 3 Jun 2013 11:39:40 -0400 Message-ID: <51ACB8B6.60603@gmail.com> Date: Mon, 03 Jun 2013 23:39:34 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.5) Gecko/20120607 Thunderbird/10.0.5 MIME-Version: 1.0 To: Andrew Morton CC: "linux-kernel@vger.kernel.org" , Linux MM Subject: [PATCH] mm, vmalloc: Use clamp to simplify code Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Yanfei Signed-off-by: Zhang Yanfei --- mm/vmalloc.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d365724..2d7eb81 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1337,16 +1337,8 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, struct vm_struct *area; BUG_ON(in_interrupt()); - if (flags & VM_IOREMAP) { - int bit = fls(size); - - if (bit > IOREMAP_MAX_ORDER) - bit = IOREMAP_MAX_ORDER; - else if (bit < PAGE_SHIFT) - bit = PAGE_SHIFT; - - align = 1ul << bit; - } + if (flags & VM_IOREMAP) + align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER); size = PAGE_ALIGN(size); if (unlikely(!size)) -- 1.7.1