From: Cedric Le Goater Subject: namespaces sysvipc : move struct ipc_ids to ipc.h Signed-off-by: Cedric Le Goater --- include/linux/ipc.h | 17 +++++++++++++++++ ipc/util.h | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) Index: 2.6.17-rc5-mm3/include/linux/ipc.h =================================================================== --- 2.6.17-rc5-mm3.orig/include/linux/ipc.h +++ 2.6.17-rc5-mm3/include/linux/ipc.h @@ -51,6 +51,8 @@ struct ipc_perm #ifdef __KERNEL__ +#include + #define IPCMNI 32768 /* <= MAX_INT limit for ipc arrays (including sysctl changes) */ /* used by in-kernel data structures */ @@ -68,6 +70,21 @@ struct kern_ipc_perm void *security; }; +struct ipc_id_ary { + int size; + struct kern_ipc_perm *p[0]; +}; + +struct ipc_ids { + int in_use; + int max_id; + unsigned short seq; + unsigned short seq_max; + struct mutex mutex; + struct ipc_id_ary nullentry; + struct ipc_id_ary* entries; +}; + #endif /* __KERNEL__ */ #endif /* _LINUX_IPC_H */ Index: 2.6.17-rc5-mm3/ipc/util.h =================================================================== --- 2.6.17-rc5-mm3.orig/ipc/util.h +++ 2.6.17-rc5-mm3/ipc/util.h @@ -15,21 +15,6 @@ void sem_init (void); void msg_init (void); void shm_init (void); -struct ipc_id_ary { - int size; - struct kern_ipc_perm *p[0]; -}; - -struct ipc_ids { - int in_use; - int max_id; - unsigned short seq; - unsigned short seq_max; - struct mutex mutex; - struct ipc_id_ary nullentry; - struct ipc_id_ary* entries; -}; - struct seq_file; void __init ipc_init_ids(struct ipc_ids* ids, int size); #ifdef CONFIG_PROC_FS