---

yaml --- r: 97898 b: refs/heads/master c: 19f2b8d h: refs/heads/master v: v3
git-mirror · Jun 10, 2008 · a18f96e · a18f96e
1 parent 680d1ae
commit a18f96e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;