diff --git a/[refs] b/[refs]
index d3fa4fb3dd08..613f1a88f882 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e70b7f3c24468bb1635b295945edb48ecd9656a
+refs/heads/master: c592713b3e124ce0719e6af4bc2520424c49cbae
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 554429ade079..d05f6b564998 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -894,8 +894,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 	if (!sfd)
 		goto out_put_dentry;
 
-	err = -ENOMEM;
-
 	file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations);
 	if (!file)
 		goto out_free;