4 files changed, 38 insertions, 72 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 2beec5949399..da5b07c20fc5 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -14,8 +14,6 @@ header-y += vsyscall32.h
 unifdef-y += e820.h
 unifdef-y += ist.h
 unifdef-y += mce.h
-unifdef-y += msgbuf_32.h
-unifdef-y += msgbuf_64.h
 unifdef-y += msr_32.h
 unifdef-y += msr_64.h
 unifdef-y += msr.h
diff --git a/include/asm-x86/msgbuf.h b/include/asm-x86/msgbuf.h
index 154f7d64e862..7e4e9481f51c 100644
--- a/include/asm-x86/msgbuf.h
+++ b/include/asm-x86/msgbuf.h
@@ -1,13 +1,39 @@
-#ifdef __KERNEL__
+#ifndef _ASM_X86_MSGBUF_H
-# ifdef CONFIG_X86_32
+#define _ASM_X86_MSGBUF_H
-#  include "msgbuf_32.h"
-# else
+/*
-#  include "msgbuf_64.h"
+ * The msqid64_ds structure for i386 architecture.
-# endif
+ * Note extra padding because this structure is passed back and forth
-#else
+ * between kernel and user space.
-# ifdef __i386__
+ *
-#  include "msgbuf_32.h"
+ * Pad space on i386 is left for:
-# else
+ * - 64-bit time_t to solve y2038 problem
-#  include "msgbuf_64.h"
+ * - 2 miscellaneous 32-bit values
-# endif
+ *
+ * Pad space on x8664 is left for:
+ * - 2 miscellaneous 64-bit values
+ */
+struct msqid64_ds {
+        struct ipc64_perm msg_perm;
+        __kernel_time_t msg_stime;      /* last msgsnd time */
+#ifdef __i386__
+        unsigned long   __unused1;
 #endif
+        __kernel_time_t msg_rtime;      /* last msgrcv time */
+#ifdef __i386__
+        unsigned long   __unused2;
+#endif
+        __kernel_time_t msg_ctime;      /* last change time */
+#ifdef __i386__
+        unsigned long   __unused3;
+#endif
+        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 /* _ASM_X86_MSGBUF_H */
diff --git a/include/asm-x86/msgbuf_32.h b/include/asm-x86/msgbuf_32.h
deleted file mode 100644
index b8d659c157ae..000000000000
--- a/include/asm-x86/msgbuf_32.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _I386_MSGBUF_H
-#define _I386_MSGBUF_H
-/* 
- * The msqid64_ds structure for i386 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 /* _I386_MSGBUF_H */
diff --git a/include/asm-x86/msgbuf_64.h b/include/asm-x86/msgbuf_64.h
deleted file mode 100644
index cd6f95dd54da..000000000000
--- a/include/asm-x86/msgbuf_64.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _X8664_MSGBUF_H
-#define _X8664_MSGBUF_H
-/* 
- * The msqid64_ds structure for x86-64 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 2 miscellaneous 64-bit values
- */
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        __kernel_time_t msg_ctime;      /* last change time */
-        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

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 2beec5949399..da5b07c20fc5 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild
@@ -14,8 +14,6 @@ header-y += vsyscall32.h
14	unifdef-y += e820.h	14	unifdef-y += e820.h
15	unifdef-y += ist.h	15	unifdef-y += ist.h
16	unifdef-y += mce.h	16	unifdef-y += mce.h
17	unifdef-y += msgbuf_32.h
18	unifdef-y += msgbuf_64.h
19	unifdef-y += msr_32.h	17	unifdef-y += msr_32.h
20	unifdef-y += msr_64.h	18	unifdef-y += msr_64.h
21	unifdef-y += msr.h	19	unifdef-y += msr.h


diff --git a/include/asm-x86/msgbuf.h b/include/asm-x86/msgbuf.h index 154f7d64e862..7e4e9481f51c 100644 --- a/include/asm-x86/msgbuf.h +++ b/include/asm-x86/msgbuf.h
@@ -1,13 +1,39 @@
1	#ifdef __KERNEL__	1	#ifndef _ASM_X86_MSGBUF_H
2	# ifdef CONFIG_X86_32	2	#define _ASM_X86_MSGBUF_H
3	# include "msgbuf_32.h"	3
4	# else	4	/*
5	# include "msgbuf_64.h"	5	* The msqid64_ds structure for i386 architecture.
6	# endif	6	* Note extra padding because this structure is passed back and forth
7	#else	7	* between kernel and user space.
8	# ifdef __i386__	8	*
9	# include "msgbuf_32.h"	9	* Pad space on i386 is left for:
10	# else	10	* - 64-bit time_t to solve y2038 problem
11	# include "msgbuf_64.h"	11	* - 2 miscellaneous 32-bit values
12	# endif	12	*
		13	* Pad space on x8664 is left for:
		14	* - 2 miscellaneous 64-bit values
		15	*/
		16	struct msqid64_ds {
		17	struct ipc64_perm msg_perm;
		18	__kernel_time_t msg_stime; /* last msgsnd time */
		19	#ifdef __i386__
		20	unsigned long __unused1;
13	#endif	21	#endif
		22	__kernel_time_t msg_rtime; /* last msgrcv time */
		23	#ifdef __i386__
		24	unsigned long __unused2;
		25	#endif
		26	__kernel_time_t msg_ctime; /* last change time */
		27	#ifdef __i386__
		28	unsigned long __unused3;
		29	#endif
		30	unsigned long msg_cbytes; /* current number of bytes on queue */
		31	unsigned long msg_qnum; /* number of messages in queue */
		32	unsigned long msg_qbytes; /* max number of bytes on queue */
		33	__kernel_pid_t msg_lspid; /* pid of last msgsnd */
		34	__kernel_pid_t msg_lrpid; /* last receive pid */
		35	unsigned long __unused4;
		36	unsigned long __unused5;
		37	};
		38
		39	#endif /* _ASM_X86_MSGBUF_H */


diff --git a/include/asm-x86/msgbuf_32.h b/include/asm-x86/msgbuf_32.h deleted file mode 100644 index b8d659c157ae..000000000000 --- a/include/asm-x86/msgbuf_32.h +++ /dev/null
@@ -1,31 +0,0 @@
1	#ifndef _I386_MSGBUF_H
2	#define _I386_MSGBUF_H
3
4	/*
5	* The msqid64_ds structure for i386 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	* - 64-bit time_t to solve y2038 problem
11	* - 2 miscellaneous 32-bit values
12	*/
13
14	struct msqid64_ds {
15	struct ipc64_perm msg_perm;
16	__kernel_time_t msg_stime; /* last msgsnd time */
17	unsigned long __unused1;
18	__kernel_time_t msg_rtime; /* last msgrcv time */
19	unsigned long __unused2;
20	__kernel_time_t msg_ctime; /* last change time */
21	unsigned long __unused3;
22	unsigned long msg_cbytes; /* current number of bytes on queue */
23	unsigned long msg_qnum; /* number of messages in queue */
24	unsigned long msg_qbytes; /* max number of bytes on queue */
25	__kernel_pid_t msg_lspid; /* pid of last msgsnd */
26	__kernel_pid_t msg_lrpid; /* last receive pid */
27	unsigned long __unused4;
28	unsigned long __unused5;
29	};
30
31	#endif /* _I386_MSGBUF_H */


diff --git a/include/asm-x86/msgbuf_64.h b/include/asm-x86/msgbuf_64.h deleted file mode 100644 index cd6f95dd54da..000000000000 --- a/include/asm-x86/msgbuf_64.h +++ /dev/null
@@ -1,27 +0,0 @@
1	#ifndef _X8664_MSGBUF_H
2	#define _X8664_MSGBUF_H
3
4	/*
5	* The msqid64_ds structure for x86-64 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	* - 2 miscellaneous 64-bit values
11	*/
12
13	struct msqid64_ds {
14	struct ipc64_perm msg_perm;
15	__kernel_time_t msg_stime; /* last msgsnd time */
16	__kernel_time_t msg_rtime; /* last msgrcv time */
17	__kernel_time_t msg_ctime; /* last change time */
18	unsigned long msg_cbytes; /* current number of bytes on queue */
19	unsigned long msg_qnum; /* number of messages in queue */
20	unsigned long msg_qbytes; /* max number of bytes on queue */
21	__kernel_pid_t msg_lspid; /* pid of last msgsnd */
22	__kernel_pid_t msg_lrpid; /* last receive pid */
23	unsigned long __unused4;
24	unsigned long __unused5;
25	};
26
27	#endif