Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index c4d870b0d5e6..f6c82de12541 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -22,7 +22,7 @@ struct ipc_ids {
         int in_use;
         unsigned short seq;
         unsigned short seq_max;
-        struct rw_semaphore rw_mutex;
+        struct rw_semaphore rwsem;
         struct idr ipcs_idr;
         int next_id;
 };
@@ -34,9 +34,9 @@ struct ipc_namespace {
         int             sem_ctls[4];
         int             used_sems;
 
-        int             msg_ctlmax;
-        int             msg_ctlmnb;
-        int             msg_ctlmni;
+        unsigned int    msg_ctlmax;
+        unsigned int    msg_ctlmnb;
+        unsigned int    msg_ctlmni;
         atomic_t        msg_bytes;
         atomic_t        msg_hdrs;
         int             auto_msgmni;