Blackfin: convert shm/sysv/ipc to asm-generic

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/arch/blackfin/include/asm/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h
index 8f0899cdf4d225ed9b71f28b94c047b070db44ba..84c7e51cb6d0befd2b3c013c8bbbbaad6ae02297 100644 (file)
--- a/arch/blackfin/include/asm/ipcbuf.h
+++ b/arch/blackfin/include/asm/ipcbuf.h
@@ -1,30 +1 @@
-/* Changes origined from m68k version.    Lineo Inc.  May 2001   */
-
-#ifndef __BFIN_IPCBUF_H__
-#define __BFIN_IPCBUF_H__
-
-/*
- * The user_ipc_perm structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm {
-       __kernel_key_t key;
-       __kernel_uid32_t uid;
-       __kernel_gid32_t gid;
-       __kernel_uid32_t cuid;
-       __kernel_gid32_t cgid;
-       __kernel_mode_t mode;
-       unsigned short __pad1;
-       unsigned short seq;
-       unsigned short __pad2;
-       unsigned long __unused1;
-       unsigned long __unused2;
-};
-
-#endif                         /* __BFIN_IPCBUF_H__ */
+#include <asm-generic/ipcbuf.h>

diff --git a/arch/blackfin/include/asm/msgbuf.h b/arch/blackfin/include/asm/msgbuf.h
index 6fcbe8cd801def80e3fb3b9cb772242deedd9b7e..809134c644a677032e9eb2ae5d5a844806bc347e 100644 (file)
--- a/arch/blackfin/include/asm/msgbuf.h
+++ b/arch/blackfin/include/asm/msgbuf.h
@@ -1,31 +1 @@
-#ifndef _BFIN_MSGBUF_H
-#define _BFIN_MSGBUF_H
-
-/*
- * The msqid64_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 msqid64_ds {
-       struct ipc64_perm msg_perm;
-       __kernel_time_t msg_stime;      /* last msgsnd time */
-       unsigned long __unused1;
-       __kernel_time_t msg_rtime;      /* last msgrcv time */
-       unsigned long __unused2;
-       __kernel_time_t msg_ctime;      /* last change time */
-       unsigned long __unused3;
-       unsigned long msg_cbytes;       /* current number of bytes on queue */
-       unsigned long msg_qnum; /* number of messages in queue */
-       unsigned long msg_qbytes;       /* max number of bytes on queue */
-       __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-       __kernel_pid_t msg_lrpid;       /* last receive pid */
-       unsigned long __unused4;
-       unsigned long __unused5;
-};
-
-#endif                         /* _BFIN_MSGBUF_H */
+#include <asm-generic/msgbuf.h>

diff --git a/arch/blackfin/include/asm/sembuf.h b/arch/blackfin/include/asm/sembuf.h
index 18deb5c7fa5d6a4db2502739c558d244e19324a6..7673b83cfef73397301a171e86cf492b771ad9b4 100644 (file)
--- a/arch/blackfin/include/asm/sembuf.h
+++ b/arch/blackfin/include/asm/sembuf.h
@@ -1,25 +1 @@
-#ifndef _BFIN_SEMBUF_H
-#define _BFIN_SEMBUF_H
-
-/*
- * The semid64_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 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                         /* _BFIN_SEMBUF_H */
+#include <asm-generic/sembuf.h>

diff --git a/arch/blackfin/include/asm/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h
index 612436303e8917383b210197f4367cabb69d23d4..83c05fc2de385c3260286bf12fed846617c8c095 100644 (file)
--- 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>

diff --git a/arch/blackfin/include/asm/shmparam.h b/arch/blackfin/include/asm/shmparam.h
index 3c03906b7664525aa31fc3c45e4536c8546a0ad6..93f30deb95d0803ee9b84ade84d3c6738894603a 100644 (file)
--- a/arch/blackfin/include/asm/shmparam.h
+++ b/arch/blackfin/include/asm/shmparam.h
@@ -1,6 +1 @@
-#ifndef _BFIN_SHMPARAM_H
-#define _BFIN_SHMPARAM_H
-
-#define        SHMLBA PAGE_SIZE        /* attach addr a multiple of this */
-
-#endif                         /* _BFIN_SHMPARAM_H */
+#include <asm-generic/shmparam.h>