diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:10:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:10:36 -0800 |
commit | 3d9de1909b339f967f1b37367df233a0dcfc10cf (patch) | |
tree | b2360a9ac142e15007ebe0fabf0365b9d4cd8b65 /arch/alpha/include/uapi/asm/sembuf.h | |
parent | 9a8a5702c5a7298c0edd125464aa178dd8b50440 (diff) | |
parent | 96433f6ee49032d7a8bda76de2b05cfde2914354 (diff) | |
download | op-kernel-dev-3d9de1909b339f967f1b37367df233a0dcfc10cf.zip op-kernel-dev-3d9de1909b339f967f1b37367df233a0dcfc10cf.tar.gz |
Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for Alpha from David Howells:
"I've been asked to send the Alpha UAPI disintegration to you directly.
The acks I have been given have been added into the patch."
* tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/alpha/include/asm
Diffstat (limited to 'arch/alpha/include/uapi/asm/sembuf.h')
-rw-r--r-- | arch/alpha/include/uapi/asm/sembuf.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/alpha/include/uapi/asm/sembuf.h b/arch/alpha/include/uapi/asm/sembuf.h new file mode 100644 index 0000000..7b38b15 --- /dev/null +++ b/arch/alpha/include/uapi/asm/sembuf.h @@ -0,0 +1,22 @@ +#ifndef _ALPHA_SEMBUF_H +#define _ALPHA_SEMBUF_H + +/* + * The semid64_ds structure for alpha 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 /* _ALPHA_SEMBUF_H */ |