Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (48 commits)
  Documentation: fix minor kernel-doc warnings
  BUG_ON() Conversion in drivers/net/
  BUG_ON() Conversion in drivers/s390/net/lcs.c
  BUG_ON() Conversion in mm/slab.c
  BUG_ON() Conversion in mm/highmem.c
  BUG_ON() Conversion in kernel/signal.c
  BUG_ON() Conversion in kernel/signal.c
  BUG_ON() Conversion in kernel/ptrace.c
  BUG_ON() Conversion in ipc/shm.c
  BUG_ON() Conversion in fs/freevxfs/
  BUG_ON() Conversion in fs/udf/
  BUG_ON() Conversion in fs/sysv/
  BUG_ON() Conversion in fs/inode.c
  BUG_ON() Conversion in fs/fcntl.c
  BUG_ON() Conversion in fs/dquot.c
  BUG_ON() Conversion in md/raid10.c
  BUG_ON() Conversion in md/raid6main.c
  BUG_ON() Conversion in md/raid5.c
  Fix minor documentation typo
  BFP->BPF in Documentation/networking/tuntap.txt
  ...

1 files changed, 3 insertions, 6 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 4f5b5709136a..e780d19aa214 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -294,8 +294,7 @@ void validate_mm(struct mm_struct *mm)
         i = browse_rb(&mm->mm_rb);
         if (i != mm->map_count)
                 printk("map_count %d rb %d\n", mm->map_count, i), bug = 1;
-        if (bug)
-                BUG();
+        BUG_ON(bug);
 }
 #else
 #define validate_mm(mm) do { } while (0)
@@ -432,8 +431,7 @@ __insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
         struct rb_node ** rb_link, * rb_parent;
 
         __vma = find_vma_prepare(mm, vma->vm_start,&prev, &rb_link, &rb_parent);
-        if (__vma && __vma->vm_start < vma->vm_end)
-                BUG();
+        BUG_ON(__vma && __vma->vm_start < vma->vm_end);
         __vma_link(mm, vma, prev, rb_link, rb_parent);
         mm->map_count++;
 }
@@ -813,8 +811,7 @@ try_prev:
          * (e.g. stash info in next's anon_vma_node when assigning
          * an anon_vma, or when trying vma_merge).  Another time.
          */
-        if (find_vma_prev(vma->vm_mm, vma->vm_start, &near) != vma)
-                BUG();
+        BUG_ON(find_vma_prev(vma->vm_mm, vma->vm_start, &near) != vma);
         if (!near)
                 goto none;