diff --git a/[refs] b/[refs]
index eda16a219f16..efedc7d5a439 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1783e60ff207805a3e75cf522b17ec9bb1604a62
+refs/heads/master: 19f2b8dfea10e4d5cd34feb08cbab738504c25cf
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;