diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 23:59:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 23:59:11 +0200 |
commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/include/asm/sembuf.h | |
parent | embedded: fix vc_translate operator precedence (diff) | |
parent | [IA64] Move include/asm-ia64 to arch/ia64/include/asm (diff) | |
download | linux-2b12a4c524812fb3f6ee590a02e65b95c8c32229.tar.xz linux-2b12a4c524812fb3f6ee590a02e65b95c8c32229.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/sembuf.h')
-rw-r--r-- | arch/ia64/include/asm/sembuf.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/sembuf.h b/arch/ia64/include/asm/sembuf.h new file mode 100644 index 000000000000..1340fbc04d3e --- /dev/null +++ b/arch/ia64/include/asm/sembuf.h @@ -0,0 +1,22 @@ +#ifndef _ASM_IA64_SEMBUF_H +#define _ASM_IA64_SEMBUF_H + +/* + * The semid64_ds structure for IA-64 architecture. + * Note extra padding because this structure is passed back and forth + * between kernel and user space. + * + * Pad space is left for: + * - 2 miscellaneous 64-bit values + */ + +struct semid64_ds { + struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ + __kernel_time_t sem_otime; /* last semop time */ + __kernel_time_t sem_ctime; /* last change time */ + unsigned long sem_nsems; /* no. of semaphores in array */ + unsigned long __unused1; + unsigned long __unused2; +}; + +#endif /* _ASM_IA64_SEMBUF_H */ |