diff --git a/[refs] b/[refs]
index 7247aa65820c..8f69cc0667ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0
+refs/heads/master: 185606fc6a120dbebffa6d06a559c20ec2b20034
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 4f133d24030f..fe7ae73b6981 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/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) {