diff --git a/[refs] b/[refs]
index ee374b7c6a5a..7dcdde37df12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce52449742697f6f51be2a7c275a4ab2a73885b8
+refs/heads/master: 8cd5283b897f56004631944dd2888e9a7b843f89
diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c
index fbf757064a32..60c1e5c23418 100644
--- a/trunk/ipc/msg.c
+++ b/trunk/ipc/msg.c
@@ -220,8 +220,7 @@ asmlinkage long sys_msgget (key_t key, int msgflg)
 		ret = -EEXIST;
 	} else {
 		msq = msg_lock(id);
-		if(msq==NULL)
-			BUG();
+		BUG_ON(msq==NULL);
 		if (ipcperms(&msq->q_perm, msgflg))
 			ret = -EACCES;
 		else {