aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/namespace.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-05-24 03:59:36 -0400
committerTejun Heo <tj@kernel.org>2011-05-24 03:59:36 -0400
commit6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch)
treec9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /ipc/namespace.c
parent0415b00d175e0d8945e6785aad21b5f157976ce0 (diff)
parent6ea0c34dac89611126455537552cffe6c7e832ad (diff)
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'ipc/namespace.c')
-rw-r--r--ipc/namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 3c3e5223e7e..8054c8e5faf 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -104,7 +104,6 @@ static void free_ipc_ns(struct ipc_namespace *ns)
104 sem_exit_ns(ns); 104 sem_exit_ns(ns);
105 msg_exit_ns(ns); 105 msg_exit_ns(ns);
106 shm_exit_ns(ns); 106 shm_exit_ns(ns);
107 kfree(ns);
108 atomic_dec(&nr_ipc_ns); 107 atomic_dec(&nr_ipc_ns);
109 108
110 /* 109 /*
@@ -113,6 +112,7 @@ static void free_ipc_ns(struct ipc_namespace *ns)
113 */ 112 */
114 ipcns_notify(IPCNS_REMOVED); 113 ipcns_notify(IPCNS_REMOVED);
115 put_user_ns(ns->user_ns); 114 put_user_ns(ns->user_ns);
115 kfree(ns);
116} 116}
117 117
118/* 118/*