3 files changed, 6 insertions, 4 deletions

diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 4a7a12c95abe..40eab7314aeb 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -26,7 +26,7 @@ static void *get_ipc(ctl_table *table)
         return which;
 }
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_SYSCTL
 static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a8ddadbc7459..916785363f0f 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -602,7 +602,7 @@ static struct file *do_create(struct dentry *dir, struct dentry *dentry,
                 dentry->d_fsdata = attr;
         }
 
-        mode &= ~current->fs->umask;
+        mode &= ~current_umask();
         ret = mnt_want_write(mqueue_mnt);
         if (ret)
                 goto out;
diff --git a/ipc/shm.c b/ipc/shm.c
index f239d87e0d37..faa46da99ebe 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -555,12 +555,14 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
         in_use = shm_ids(ns).in_use;
 
         for (total = 0, next_id = 0; total < in_use; next_id++) {
+                struct kern_ipc_perm *ipc;
                 struct shmid_kernel *shp;
                 struct inode *inode;
 
-                shp = idr_find(&shm_ids(ns).ipcs_idr, next_id);
-                if (shp == NULL)
+                ipc = idr_find(&shm_ids(ns).ipcs_idr, next_id);
+                if (ipc == NULL)
                         continue;
+                shp = container_of(ipc, struct shmid_kernel, shm_perm);
 
                 inode = shp->shm_file->f_path.dentry->d_inode;