diff --git a/[refs] b/[refs] index 8ddf60770b3c..e6e61f66adf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 910dea7fdda22f0ee83d26d459e460c79ed94557 +refs/heads/master: 5bcb28b139cffc736177ceb775d1c8b5c5a411e2 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index e347e106ca3a..d90ff9d04957 100644 --- a/trunk/mm/memory.c +++ b/trunk/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);