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/sembuf.h | |
| parent | x86: merge some trivially mergeable headers (diff) | |
| download | linux-003a46cfff308ee0d879dfa89b9a7c65b2a481bf.tar.xz linux-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/sembuf.h')
| -rw-r--r-- | include/asm-x86/sembuf.h | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/include/asm-x86/sembuf.h b/include/asm-x86/sembuf.h index e42c971e383f..ee50c801f7b7 100644 --- a/include/asm-x86/sembuf.h +++ b/include/asm-x86/sembuf.h @@ -1,13 +1,24 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "sembuf_32.h" -# else -# include "sembuf_64.h" -# endif -#else -# ifdef __i386__ -# include "sembuf_32.h" -# else -# include "sembuf_64.h" -# endif -#endif +#ifndef _ASM_X86_SEMBUF_H +#define _ASM_X86_SEMBUF_H + +/* + * The semid64_ds 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: + * - 64-bit time_t to solve y2038 problem + * - 2 miscellaneous 32-bit values + */ +struct semid64_ds { + struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ + __kernel_time_t sem_otime; /* last semop time */ + unsigned long __unused1; + __kernel_time_t sem_ctime; /* last change time */ + unsigned long __unused2; + unsigned long sem_nsems; /* no. of semaphores in array */ + unsigned long __unused3; + unsigned long __unused4; +}; + +#endif /* _ASM_X86_SEMBUF_H */ |