diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-07-03 15:04:50 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 20:55:51 +0200 |
| commit | 88acdbeec634eb5212e55b905ead0eea07aa91ec (patch) | |
| tree | a6f8e04b994bcc5bbb1e9a35ef09fccce960ee06 | |
| parent | 193845cfb0092f7ac91488da223bb8577efbf860 (diff) | |
mm, vmalloc: use clamp() to simplify code
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: I2bb66875ce24a79e5210b5ee37c106221b6e890d
(cherry picked from commit 0e3158c292b9219c5d8524d6a1bbdaeecf11de47)
| -rw-r--r-- | mm/vmalloc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index c8374fe66..84d7a46fe 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)) |