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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/

1 files changed, 2 insertions, 4 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 48a54f66a246..642659cd596b 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -229,8 +229,7 @@ asmlinkage long sys_semget (key_t key, int nsems, int semflg)
                 err = -EEXIST;
         } else {
                 sma = sem_lock(id);
-                if(sma==NULL)
-                        BUG();
+                BUG_ON(sma==NULL);
                 if (nsems > sma->sem_nsems)
                         err = -EINVAL;
                 else if (ipcperms(&sma->sem_perm, semflg))
@@ -1183,8 +1182,7 @@ retry_undos:
 
         sma = sem_lock(semid);
         if(sma==NULL) {
-                if(queue.prev != NULL)
-                        BUG();
+                BUG_ON(queue.prev != NULL);
                 error = -EIDRM;
                 goto out_free;
         }