diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /ipc/util.c | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
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 | /** |