Merge branch 'master'

1 files changed, 3 insertions, 2 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index fd2e26b6f966..41ecbd440fed 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -25,6 +25,8 @@
 #include <linux/netlink.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
+#include <linux/mutex.h>
+
 #include <net/sock.h>
 #include "util.h"
 
@@ -51,7 +53,6 @@
 #define HARD_MSGMAX     (131072/sizeof(void*))
 #define DFLT_MSGSIZEMAX 8192    /* max message size */
 
-#define NOTIFY_COOKIE_LEN       32
 
 struct ext_wait_queue {         /* queue of sleeping tasks */
         struct task_struct *task;
@@ -761,7 +762,7 @@ out_unlock:
  * The receiver accepts the message and returns without grabbing the queue
  * spinlock. Therefore an intermediate STATE_PENDING state and memory barriers
  * are necessary. The same algorithm is used for sysv semaphores, see
- * ipc/sem.c fore more details.
+ * ipc/sem.c for more details.
  *
  * The same algorithm is used for senders.
  */