diff --git a/[refs] b/[refs] index 76a9adfe02e0..6e78cb21dcf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99cee0cd7560fc4e7f3646ee18d90e328bd1cb32 +refs/heads/master: 9bc98fc6fd3d07f37b597601489df200e0024222 diff --git a/trunk/ipc/util.c b/trunk/ipc/util.c index 23151ef32590..5e785a29e1e6 100644 --- a/trunk/ipc/util.c +++ b/trunk/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) {