2 files changed, 5 insertions, 8 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 1511714a9585..02e6f6798972 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -205,11 +205,11 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent)
         return 0;
 }
 
-static struct super_block *mqueue_get_sb(struct file_system_type *fs_type,
-                                         int flags, const char *dev_name,
-                                         void *data)
+static int mqueue_get_sb(struct file_system_type *fs_type,
+                         int flags, const char *dev_name,
+                         void *data, struct vfsmount *mnt)
 {
-        return get_sb_single(fs_type, flags, data, mqueue_fill_super);
+        return get_sb_single(fs_type, flags, data, mqueue_fill_super, mnt);
 }
 
 static void init_once(void *foo, kmem_cache_t * cachep, unsigned long flags)
@@ -359,7 +359,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
         return count;
 }
 
-static int mqueue_flush_file(struct file *filp)
+static int mqueue_flush_file(struct file *filp, fl_owner_t id)
 {
         struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
 
diff --git a/ipc/shm.c b/ipc/shm.c
index 4f133d24030f..fe7ae73b6981 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -698,7 +698,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         int    err;
         unsigned long flags;
         unsigned long prot;
-        unsigned long o_flags;
         int acc_mode;
         void *user_addr;
 
@@ -725,11 +724,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 
         if (shmflg & SHM_RDONLY) {
                 prot = PROT_READ;
-                o_flags = O_RDONLY;
                 acc_mode = S_IRUGO;
         } else {
                 prot = PROT_READ | PROT_WRITE;
-                o_flags = O_RDWR;
                 acc_mode = S_IRUGO | S_IWUGO;
         }
         if (shmflg & SHM_EXEC) {