Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f2d4a8e authored by Zhang Yanfei's avatar Zhang Yanfei Committed by Linus Torvalds
Browse files

mm, vmalloc: use clamp() to simplify code 



Signed-off-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6d48005

mm/vmalloc.c

+2 −10
Original line number Diff line number Diff line
@@ -1330,16 +1330,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))