diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 06:22:31 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 06:22:31 +0400 |
| commit | 02a650e2820e19fde8f6a49752027217fdd33d78 (patch) | |
| tree | 92d97b79941c0cee9a1da1e8a21abc7a661aa0f5 /arch/avr32/include/uapi/asm/sembuf.h | |
| parent | b6897130f0ac8ac33043be736770eb5f58164044 (diff) | |
| parent | 7190632b78de594f3dabe174e9df373bfc790d89 (diff) | |
| download | linux-02a650e2820e19fde8f6a49752027217fdd33d78.tar.xz | |
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for misc arches from David Howells:
"UAPI disintegration for MN10300, FRV and AVR32 arches"
* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
UAPI: (Scripted) Disintegrate arch/frv/include/asm
UAPI: (Scripted) Disintegrate arch/avr32/include/asm
Diffstat (limited to 'arch/avr32/include/uapi/asm/sembuf.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/sembuf.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/avr32/include/uapi/asm/sembuf.h b/arch/avr32/include/uapi/asm/sembuf.h new file mode 100644 index 000000000000..e472216e0c97 --- /dev/null +++ b/arch/avr32/include/uapi/asm/sembuf.h @@ -0,0 +1,25 @@ +#ifndef __ASM_AVR32_SEMBUF_H +#define __ASM_AVR32_SEMBUF_H + +/* +* The semid64_ds structure for AVR32 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_AVR32_SEMBUF_H */ |