diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:52 +0200 |
| commit | 280ff388b1b7a818a64af4c789299e62c0d3c094 (patch) | |
| tree | d63877375029eb895131a37d2eeeac306cc6c7f0 /ipc/util.h | |
| parent | c5da9a2bb24a7928c39495cdabf98d3f7931bde5 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into x86/urgent
Merge reason: fix to be queued up depends on upstream facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'ipc/util.h')
| -rw-r--r-- | ipc/util.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ipc/util.h b/ipc/util.h index 3646b45a03c..1187332a89d 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -20,6 +20,15 @@ void shm_init (void); struct ipc_namespace; +#ifdef CONFIG_POSIX_MQUEUE +extern void mq_clear_sbinfo(struct ipc_namespace *ns); +extern void mq_put_mnt(struct ipc_namespace *ns); +#else +static inline void mq_clear_sbinfo(struct ipc_namespace *ns) { } +static inline void mq_put_mnt(struct ipc_namespace *ns) { } +#endif + +#ifdef CONFIG_SYSVIPC void sem_init_ns(struct ipc_namespace *ns); void msg_init_ns(struct ipc_namespace *ns); void shm_init_ns(struct ipc_namespace *ns); @@ -27,6 +36,15 @@ void shm_init_ns(struct ipc_namespace *ns); void sem_exit_ns(struct ipc_namespace *ns); void msg_exit_ns(struct ipc_namespace *ns); void shm_exit_ns(struct ipc_namespace *ns); +#else +static inline void sem_init_ns(struct ipc_namespace *ns) { } +static inline void msg_init_ns(struct ipc_namespace *ns) { } +static inline void shm_init_ns(struct ipc_namespace *ns) { } + +static inline void sem_exit_ns(struct ipc_namespace *ns) { } +static inline void msg_exit_ns(struct ipc_namespace *ns) { } +static inline void shm_exit_ns(struct ipc_namespace *ns) { } +#endif /* * Structure that holds the parameters needed by the ipc operations |