From 998746cbce58ab5daa651835716ce1a2429e4619 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 26 Mar 2006 18:28:38 +0200
Subject: [PATCH] --- yaml --- r: 24212 b: refs/heads/master c:
 27315c96a4c3d5f24a902111dae537cdc28302e4 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/ipc/sem.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 40ba84f665d6..a840cf39c9ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309be53da60dc24b73f3f0bceab8f0707c05371f
+refs/heads/master: 27315c96a4c3d5f24a902111dae537cdc28302e4
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
index 59696a840be1..18a78fe9c55b 100644
--- a/trunk/ipc/sem.c
+++ b/trunk/ipc/sem.c
@@ -227,8 +227,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))
@@ -1181,8 +1180,7 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
 
 	sma = sem_lock(semid);
 	if(sma==NULL) {
-		if(queue.prev != NULL)
-			BUG();
+		BUG_ON(queue.prev != NULL);
 		error = -EIDRM;
 		goto out_free;
 	}