Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 59 insertions, 0 deletions

diff --git a/include/asm-powerpc/shmbuf.h b/include/asm-powerpc/shmbuf.h
new file mode 100644
index 000000000000..29632db3b178
--- /dev/null
+++ b/include/asm-powerpc/shmbuf.h
@@ -0,0 +1,59 @@
+#ifndef _POWERPC_SHMBUF_H
+#define _POWERPC_SHMBUF_H
+
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/*
+ * The shmid64_ds structure for PPC 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 */
+#ifndef __power64__
+        unsigned long           __unused1;
+#endif
+        __kernel_time_t         shm_atime;      /* last attach time */
+#ifndef __power64__
+        unsigned long           __unused2;
+#endif
+        __kernel_time_t         shm_dtime;      /* last detach time */
+#ifndef __power64__
+        unsigned long           __unused3;
+#endif
+        __kernel_time_t         shm_ctime;      /* last change time */
+#ifndef __power64__
+        unsigned long           __unused4;
+#endif
+        size_t                  shm_segsz;      /* size of segment (bytes) */
+        __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           __unused5;
+        unsigned long           __unused6;
+};
+
+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 /* _POWERPC_SHMBUF_H */