diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
| commit | e61ac0b05c53f5b56f3ea623c215437c09d8265b (patch) | |
| tree | 70f97df839761058f2367d40c629b87e8e932a19 /arch/cris/include/uapi/asm/shmbuf.h | |
| parent | 8e6b4dd1e1fbe81e7f9756eb8299632de641b2e1 (diff) | |
| parent | e717abac8a9f65eee6de3bb37e10c6916bced483 (diff) | |
| download | op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.zip op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.tar.gz | |
Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
UAPI Disintegration 2012-10-09
* tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/cris/include/asm
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
Diffstat (limited to 'arch/cris/include/uapi/asm/shmbuf.h')
| -rw-r--r-- | arch/cris/include/uapi/asm/shmbuf.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/arch/cris/include/uapi/asm/shmbuf.h b/arch/cris/include/uapi/asm/shmbuf.h new file mode 100644 index 0000000..3239e3f --- /dev/null +++ b/arch/cris/include/uapi/asm/shmbuf.h @@ -0,0 +1,42 @@ +#ifndef _CRIS_SHMBUF_H +#define _CRIS_SHMBUF_H + +/* + * The shmid64_ds structure for CRIS architecture (same as for i386) + * 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 shmid64_ds { + struct ipc64_perm shm_perm; /* operation perms */ + size_t shm_segsz; /* size of segment (bytes) */ + __kernel_time_t shm_atime; /* last attach time */ + unsigned long __unused1; + __kernel_time_t shm_dtime; /* last detach time */ + unsigned long __unused2; + __kernel_time_t shm_ctime; /* last change time */ + unsigned long __unused3; + __kernel_pid_t shm_cpid; /* pid of creator */ + __kernel_pid_t shm_lpid; /* pid of last operator */ + unsigned long shm_nattch; /* no. of current attaches */ + unsigned long __unused4; + unsigned long __unused5; +}; + +struct shminfo64 { + unsigned long shmmax; + unsigned long shmmin; + unsigned long shmmni; + unsigned long shmseg; + unsigned long shmall; + unsigned long __unused1; + unsigned long __unused2; + unsigned long __unused3; + unsigned long __unused4; +}; + +#endif /* _CRIS_SHMBUF_H */ |
