From e9c2e4afc7dbd569725ee34cdfdd27c22ec05c00 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 10 Jun 2008 10:03:18 +0200 Subject: [PATCH] --- yaml --- r: 97890 b: refs/heads/master c: 148f1678f0ba7a5e79e44ff23064d4326fa145a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 1 + trunk/ipc/shm.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 613f1a88f882..50f5c440bfa4 100644 --- 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 index 93acb3c1859d..107e492cb47e 100644 --- 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 index d05f6b564998..554429ade079 100644 --- 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;