diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:57:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:57:17 -0700 |
| commit | 4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch) | |
| tree | ba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /arch/m32r/include/asm/sembuf.h | |
| parent | b9836e08375d86834edcde45e3628e63db8b9624 (diff) | |
| parent | 78a49990269a539fc77e9a669d9e74e1dfaec657 (diff) | |
| download | talos-op-linux-4dc8ab86e0724642e2f778116de64f4b832d7d94.tar.gz talos-op-linux-4dc8ab86e0724642e2f778116de64f4b832d7d94.zip | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: move include/asm-m32r/* to arch/m32r/include/asm/
m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'arch/m32r/include/asm/sembuf.h')
| -rw-r--r-- | arch/m32r/include/asm/sembuf.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/sembuf.h b/arch/m32r/include/asm/sembuf.h new file mode 100644 index 000000000000..c9873d6890e2 --- /dev/null +++ b/arch/m32r/include/asm/sembuf.h @@ -0,0 +1,25 @@ +#ifndef _ASM_M32R_SEMBUF_H +#define _ASM_M32R_SEMBUF_H + +/* + * The semid64_ds structure for m32r 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_M32R_SEMBUF_H */ |
