Force this on for -next/mm testing purposes.

Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: "Serge E. Hallyn" <serge.hallyn@canonical.com>
Cc: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/ipc/shm.c b/ipc/shm.c
index 02ecf2c078fce9b62ee2b1ec0ef252c0320acdf5..5da50165a5bde2f0f0d712c71e2e1394ec1d035d 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -74,7 +74,7 @@ void shm_init_ns(struct ipc_namespace *ns)
        ns->shm_ctlmax = SHMMAX;
        ns->shm_ctlall = SHMALL;
        ns->shm_ctlmni = SHMMNI;
-       ns->shm_rmid_forced = 0;
+       ns->shm_rmid_forced = 1;
        ns->shm_tot = 0;
        ipc_init_ids(&shm_ids(ns));
 }