From: Andrew Morton Fix build with CONFIG_SYSVIPC=n. Correctly, I hope. Serge, you tend to do this rather a lot - please test things better. At least with allnoconfig and allmodconfig. Cc: Serge E. Hallyn Signed-off-by: Andrew Morton --- include/linux/ipc.h | 9 +++++++-- util.c | 0 2 files changed, 7 insertions(+), 2 deletions(-) diff -puN include/linux/ipc.h~merge-sys_clone-sys_unshare-nsproxy-and-namespace-fix-fix-fix include/linux/ipc.h --- a/include/linux/ipc.h~merge-sys_clone-sys_unshare-nsproxy-and-namespace-fix-fix-fix +++ a/include/linux/ipc.h @@ -92,12 +92,17 @@ extern struct ipc_namespace init_ipc_ns; #ifdef CONFIG_SYSVIPC #define INIT_IPC_NS(ns) .ns = &init_ipc_ns, +extern struct ipc_namespace *copy_ipcs(unsigned long flags, + struct ipc_namespace *ns); #else #define INIT_IPC_NS(ns) +static inline struct ipc_namespace *copy_ipcs(unsigned long flags, + struct ipc_namespace *ns) +{ + return ns; +} #endif -extern struct ipc_namespace *copy_ipcs(unsigned long flags, - struct ipc_namespace *ns); #ifdef CONFIG_IPC_NS extern void free_ipc_ns(struct kref *kref); #endif diff -puN ipc/util.c~merge-sys_clone-sys_unshare-nsproxy-and-namespace-fix-fix-fix ipc/util.c _