3 files changed, 34 insertions, 57 deletions
diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h
new file mode 100644
index 000000000000..dc0f4d16d05e
--- /dev/null
+++ b/include/asm-powerpc/ipcbuf.h
@@ -0,0 +1,34 @@
+#ifndef _ASM_POWERPC_IPCBUF_H
+#define _ASM_POWERPC_IPCBUF_H
+/*
+ * The ipc64_perm structure for the powerpc is identical to
+ * kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the
+ * kernel.  Note extra padding because this structure is passed back
+ * and forth between kernel and user space.  Pad space is left for:
+ *      - 1 32-bit value to fill up for 8-byte alignment
+ *      - 2 miscellaneous 64-bit values
+ *
+ * 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.
+ */
+#include <linux/types.h>
+struct ipc64_perm
+{
+        __kernel_key_t  key;
+        __kernel_uid_t  uid;
+        __kernel_gid_t  gid;
+        __kernel_uid_t  cuid;
+        __kernel_gid_t  cgid;
+        __kernel_mode_t mode;
+        unsigned int    seq;
+        unsigned int    __pad1;
+        u64             __unused1;
+        u64             __unused2;
+};
+#endif /* _ASM_POWERPC_IPCBUF_H */
diff --git a/include/asm-ppc/ipcbuf.h b/include/asm-ppc/ipcbuf.h
deleted file mode 100644
index fab6752c7480..000000000000
--- a/include/asm-ppc/ipcbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __PPC_IPCBUF_H__
-#define __PPC_IPCBUF_H__
-/*
- * The ipc64_perm 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:
- * - 1 32-bit value to fill up for 8-byte alignment
- * - 2 miscellaneous 64-bit values (so that this structure matches
- *                                  PPC64 ipc64_perm)
- */
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid_t          uid;
-        __kernel_gid_t          gid;
-        __kernel_uid_t          cuid;
-        __kernel_gid_t          cgid;
-        __kernel_mode_t         mode;
-        unsigned long           seq;
-        unsigned int            __pad2;
-        unsigned long long      __unused1;
-        unsigned long long      __unused2;
-};
-#endif /* __PPC_IPCBUF_H__ */
diff --git a/include/asm-ppc64/ipcbuf.h b/include/asm-ppc64/ipcbuf.h
deleted file mode 100644
index fa393c8342af..000000000000
--- a/include/asm-ppc64/ipcbuf.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __PPC64_IPCBUF_H__
-#define __PPC64_IPCBUF_H__
-/*
- * The ipc64_perm structure for the PPC is identical to kern_ipc_perm
- * as we have always had 32-bit UIDs and GIDs in the kernel.
- *
- * 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.
- */
-struct ipc64_perm
-{
-        __kernel_key_t  key;
-        __kernel_uid_t  uid;
-        __kernel_gid_t  gid;
-        __kernel_uid_t  cuid;
-        __kernel_gid_t  cgid;
-        __kernel_mode_t mode;
-        unsigned int    seq;
-        unsigned int    __pad1;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-};
-#endif /* __PPC64_IPCBUF_H__ */

diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h new file mode 100644 index 000000000000..dc0f4d16d05e --- /dev/null +++ b/include/asm-powerpc/ipcbuf.h
@@ -0,0 +1,34 @@
		1	#ifndef _ASM_POWERPC_IPCBUF_H
		2	#define _ASM_POWERPC_IPCBUF_H
		3
		4	/*
		5	* The ipc64_perm structure for the powerpc is identical to
		6	* kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the
		7	* kernel. Note extra padding because this structure is passed back
		8	* and forth between kernel and user space. Pad space is left for:
		9	* - 1 32-bit value to fill up for 8-byte alignment
		10	* - 2 miscellaneous 64-bit values
		11	*
		12	* This program is free software; you can redistribute it and/or
		13	* modify it under the terms of the GNU General Public License
		14	* as published by the Free Software Foundation; either version
		15	* 2 of the License, or (at your option) any later version.
		16	*/
		17
		18	#include <linux/types.h>
		19
		20	struct ipc64_perm
		21	{
		22	__kernel_key_t key;
		23	__kernel_uid_t uid;
		24	__kernel_gid_t gid;
		25	__kernel_uid_t cuid;
		26	__kernel_gid_t cgid;
		27	__kernel_mode_t mode;
		28	unsigned int seq;
		29	unsigned int __pad1;
		30	u64 __unused1;
		31	u64 __unused2;
		32	};
		33
		34	#endif /* _ASM_POWERPC_IPCBUF_H */


diff --git a/include/asm-ppc/ipcbuf.h b/include/asm-ppc/ipcbuf.h deleted file mode 100644 index fab6752c7480..000000000000 --- a/include/asm-ppc/ipcbuf.h +++ /dev/null
@@ -1,29 +0,0 @@
1	#ifndef __PPC_IPCBUF_H__
2	#define __PPC_IPCBUF_H__
3
4	/*
5	* The ipc64_perm structure for PPC architecture.
6	* Note extra padding because this structure is passed back and forth
7	* between kernel and user space.
8	*
9	* Pad space is left for:
10	* - 1 32-bit value to fill up for 8-byte alignment
11	* - 2 miscellaneous 64-bit values (so that this structure matches
12	* PPC64 ipc64_perm)
13	*/
14
15	struct ipc64_perm
16	{
17	__kernel_key_t key;
18	__kernel_uid_t uid;
19	__kernel_gid_t gid;
20	__kernel_uid_t cuid;
21	__kernel_gid_t cgid;
22	__kernel_mode_t mode;
23	unsigned long seq;
24	unsigned int __pad2;
25	unsigned long long __unused1;
26	unsigned long long __unused2;
27	};
28
29	#endif /* __PPC_IPCBUF_H__ */


diff --git a/include/asm-ppc64/ipcbuf.h b/include/asm-ppc64/ipcbuf.h deleted file mode 100644 index fa393c8342af..000000000000 --- a/include/asm-ppc64/ipcbuf.h +++ /dev/null
@@ -1,28 +0,0 @@
1	#ifndef __PPC64_IPCBUF_H__
2	#define __PPC64_IPCBUF_H__
3
4	/*
5	* The ipc64_perm structure for the PPC is identical to kern_ipc_perm
6	* as we have always had 32-bit UIDs and GIDs in the kernel.
7	*
8	* This program is free software; you can redistribute it and/or
9	* modify it under the terms of the GNU General Public License
10	* as published by the Free Software Foundation; either version
11	* 2 of the License, or (at your option) any later version.
12	*/
13
14	struct ipc64_perm
15	{
16	__kernel_key_t key;
17	__kernel_uid_t uid;
18	__kernel_gid_t gid;
19	__kernel_uid_t cuid;
20	__kernel_gid_t cgid;
21	__kernel_mode_t mode;
22	unsigned int seq;
23	unsigned int __pad1;
24	unsigned long __unused1;
25	unsigned long __unused2;
26	};
27
28	#endif /* __PPC64_IPCBUF_H__ */