diff options
| author | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /ipc/util.h | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'ipc/util.h')
| -rw-r--r-- | ipc/util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipc/util.h b/ipc/util.h index 1187332a89d..ab3ebf2621b 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -128,7 +128,7 @@ void ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out); struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd, struct ipc64_perm *perm, int extra_perm); -#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__) +#ifndef __ARCH_WANT_IPC_PARSE_VERSION /* On IA-64, we always use the "64-bit version" of the IPC structures. */ # define ipc_parse_version(cmd) IPC_64 #else @@ -171,5 +171,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, struct ipc_ops *ops, struct ipc_params *params); - +void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids, + void (*free)(struct ipc_namespace *, struct kern_ipc_perm *)); #endif |