diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-26 18:30:52 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-03-26 18:30:52 +0200 |
| commit | 5bcb28b139cffc736177ceb775d1c8b5c5a411e2 (patch) | |
| tree | 5a5e5624994c3a15dc4bd3beae07a2f891ba84dc /mm/memory.c | |
| parent | BUG_ON() Conversion in kernel/fork.c (diff) | |
| download | linux-5bcb28b139cffc736177ceb775d1c8b5c5a411e2.tar.xz linux-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/memory.c')
| -rw-r--r-- | mm/memory.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index e347e106ca3a..d90ff9d04957 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); |