Merge branch 'master'

1 files changed, 2 insertions, 4 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 23151ef32590..5e785a29e1e6 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -266,8 +266,7 @@ struct kern_ipc_perm* ipc_rmid(struct ipc_ids* ids, int id)
 {
         struct kern_ipc_perm* p;
         int lid = id % SEQ_MULTIPLIER;
-        if(lid >= ids->entries->size)
-                BUG();
+        BUG_ON(lid >= ids->entries->size);
 
         /* 
          * do not need a rcu_dereference()() here to force ordering
@@ -275,8 +274,7 @@ struct kern_ipc_perm* ipc_rmid(struct ipc_ids* ids, int id)
          */     
         p = ids->entries->p[lid];
         ids->entries->p[lid] = NULL;
-        if(p==NULL)
-                BUG();
+        BUG_ON(p==NULL);
         ids->in_use--;
 
         if (lid == ids->max_id) {