[PATCH] x86_64: Rename struct node in x86-64 NUMA code to struct bootnode

[powerpc.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index d035bd2..60c1e5c 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -12,9 +12,10 @@
  *
  * mostly rewritten, threaded and wake-one semantics added
  * MSGMAX limit removed, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/msg.h>
@@ -219,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 {