diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 13:57:47 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:17:10 +0200 |
| commit | 003a46cfff308ee0d879dfa89b9a7c65b2a481bf (patch) | |
| tree | 234552110912d4b9d6519474823e98e1a1726d16 /include/asm-x86/ipcbuf.h | |
| parent | x86: merge some trivially mergeable headers (diff) | |
| download | linux-dev-003a46cfff308ee0d879dfa89b9a7c65b2a481bf.tar.xz linux-dev-003a46cfff308ee0d879dfa89b9a7c65b2a481bf.zip | |
x86: unify some more trivial include/asm-x86/ 32/64 variants
Scripted unification.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/ipcbuf.h')
| -rw-r--r-- | include/asm-x86/ipcbuf.h | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/include/asm-x86/ipcbuf.h b/include/asm-x86/ipcbuf.h index eb2e448c6e28..2adf8b39a40b 100644 --- a/include/asm-x86/ipcbuf.h +++ b/include/asm-x86/ipcbuf.h @@ -1,13 +1,29 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "ipcbuf_32.h" -# else -# include "ipcbuf_64.h" -# endif -#else -# ifdef __i386__ -# include "ipcbuf_32.h" -# else -# include "ipcbuf_64.h" -# endif -#endif +#ifndef _ASM_X86_IPCBUF_H +#define _ASM_X86_IPCBUF_H + +/* + * The ipc64_perm structure for x86 architecture. + * Note extra padding because this structure is passed back and forth + * between kernel and user space. + * + * Pad space is left for: + * - 32-bit mode_t and seq + * - 2 miscellaneous 32-bit values + */ + +struct ipc64_perm +{ + __kernel_key_t key; + __kernel_uid32_t uid; + __kernel_gid32_t gid; + __kernel_uid32_t cuid; + __kernel_gid32_t cgid; + __kernel_mode_t mode; + unsigned short __pad1; + unsigned short seq; + unsigned short __pad2; + unsigned long __unused1; + unsigned long __unused2; +}; + +#endif /* _ASM_X86_IPCBUF_H */ |