aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-26 18:30:52 +0200
committerAdrian Bunk <bunk@stusta.de>2006-03-26 18:30:52 +0200
commit5bcb28b139cffc736177ceb775d1c8b5c5a411e2 (patch)
tree5a5e5624994c3a15dc4bd3beae07a2f891ba84dc /mm
parent910dea7fdda22f0ee83d26d459e460c79ed94557 (diff)
downloadmrst-s0i3-test-5bcb28b139cffc736177ceb775d1c8b5c5a411e2.tar.gz
mrst-s0i3-test-5bcb28b139cffc736177ceb775d1c8b5c5a411e2.tar.xz
mrst-s0i3-test-5bcb28b139cffc736177ceb775d1c8b5c5a411e2.zip
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: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c
index e347e106ca3..d90ff9d0495 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2352,10 +2352,8 @@ int make_pages_present(unsigned long addr, unsigned long end)
if (!vma)
return -1;
write = (vma->vm_flags & VM_WRITE) != 0;
- if (addr >= end)
- BUG();
- if (end > vma->vm_end)
- BUG();
+ BUG_ON(addr >= end);
+ BUG_ON(end > vma->vm_end);
len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;
ret = get_user_pages(current, current->mm, addr,
len, write, 0, NULL, NULL);