Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900...

[firefly-linux-kernel-4.4.55.git] / arch / microblaze / include / asm / shmbuf.h

diff --git a/arch/microblaze/include/asm/shmbuf.h b/arch/microblaze/include/asm/shmbuf.h
index f829c584361858e93ceb0468e30d3a7e3cdc398e..83c05fc2de385c3260286bf12fed846617c8c095 100644 (file)
--- a/arch/microblaze/include/asm/shmbuf.h
+++ b/arch/microblaze/include/asm/shmbuf.h
@@ -1,42 +1 @@
-#ifndef _ASM_MICROBLAZE_SHMBUF_H
-#define _ASM_MICROBLAZE_SHMBUF_H
-
-/*
- * The shmid64_ds structure for microblaze 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 /* _ASM_MICROBLAZE_SHMBUF_H */
+#include <asm-generic/shmbuf.h>