From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 5 Oct 2011 00:43:54 +0000 (+1100)
Subject: ipc-introduce-shm_rmid_forced-sysctl-testing
X-Git-Tag: next-20111013~1^2~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ee54f2ea7338ab65fa7d723af79441282bfc034;p=karo-tx-linux.git

ipc-introduce-shm_rmid_forced-sysctl-testing

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 02ecf2c078fc..5da50165a5bd 100644
--- 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));
 }