diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /ipc/util.c | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ipc/util.c b/ipc/util.c index 08a647965b9e..0b652387d169 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -144,6 +144,13 @@ void free_ipc_ns(struct kref *kref) | |||
| 144 | shm_exit_ns(ns); | 144 | shm_exit_ns(ns); |
| 145 | kfree(ns); | 145 | kfree(ns); |
| 146 | } | 146 | } |
| 147 | #else | ||
| 148 | int copy_ipcs(unsigned long flags, struct task_struct *tsk) | ||
| 149 | { | ||
| 150 | if (flags & CLONE_NEWIPC) | ||
| 151 | return -EINVAL; | ||
| 152 | return 0; | ||
| 153 | } | ||
| 147 | #endif | 154 | #endif |
| 148 | 155 | ||
| 149 | /** | 156 | /** |