aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/shmbuf.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-06-13 10:40:15 -0400
committerMike Frysinger <vapier@gentoo.org>2009-06-18 21:40:58 -0400
commit71b844f163f8ab66227563c74ef012b4ea5049c8 (patch)
tree9d6a30b8642c4080733c4e2a7d8ece23e5deccf1 /arch/blackfin/include/asm/shmbuf.h
parent83dab40350bda28603036d03d58f1faf0a2a5627 (diff)
downloadkernel_samsung_smdk4412-71b844f163f8ab66227563c74ef012b4ea5049c8.zip
kernel_samsung_smdk4412-71b844f163f8ab66227563c74ef012b4ea5049c8.tar.gz
kernel_samsung_smdk4412-71b844f163f8ab66227563c74ef012b4ea5049c8.tar.bz2
Blackfin: convert shm/sysv/ipc to asm-generic
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include/asm/shmbuf.h')
-rw-r--r--arch/blackfin/include/asm/shmbuf.h43
1 files changed, 1 insertions, 42 deletions
diff --git a/arch/blackfin/include/asm/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h
index 6124363..83c05fc 100644
--- a/arch/blackfin/include/asm/shmbuf.h
+++ b/arch/blackfin/include/asm/shmbuf.h
@@ -1,42 +1 @@
-#ifndef _BFIN_SHMBUF_H
-#define _BFIN_SHMBUF_H
-
-/*
- * The shmid64_ds structure for bfin 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 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 /* _BFIN_SHMBUF_H */
+#include <asm-generic/shmbuf.h>