---

yaml --- r: 97890 b: refs/heads/master c: 148f167 h: refs/heads/master v: v3
git-mirror · Jun 10, 2008 · e9c2e4a · e9c2e4a
1 parent 7456678
commit e9c2e4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c592713b3e124ce0719e6af4bc2520424c49cbae
+refs/heads/master: 148f1678f0ba7a5e79e44ff23064d4326fa145a4
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -304,6 +304,7 @@ config ARCH_SPARSEMEM_ENABLE
 	def_bool y
 	select SPARSEMEM_VMEMMAP_ENABLE
 	select SPARSEMEM_VMEMMAP
+	select SPARSEMEM_STATIC if !64BIT
 
 config ARCH_SPARSEMEM_DEFAULT
 	def_bool y

diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
@@ -894,6 +894,8 @@ 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;