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

Commit 5bcb28b1 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in mm/memory.c 



this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 910dea7f

mm/memory.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -2352,10 +2352,8 @@ int make_pages_present(unsigned long addr, unsigned long end) 
	if (!vma)

	if (!vma)

		return -1;

		return -1;

	write = (vma->vm_flags & VM_WRITE) != 0;

	write = (vma->vm_flags & VM_WRITE) != 0;

	if (addr >= end)

	BUG_ON(addr >= end);

		BUG();

	BUG_ON(end > vma->vm_end);

	if (end > vma->vm_end)

		BUG();

	len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;

	len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;

	ret = get_user_pages(current, current->mm, addr,

	ret = get_user_pages(current, current->mm, addr,

			len, write, 0, NULL, NULL);

			len, write, 0, NULL, NULL);