3 files changed, 18 insertions, 31 deletions
diff --git a/arch/x86/include/asm/seccomp.h b/arch/x86/include/asm/seccomp.h
index 0f3d7f099224..0c8c7c8861b4 100644
--- a/arch/x86/include/asm/seccomp.h
+++ b/arch/x86/include/asm/seccomp.h
@@ -1,5 +1,20 @@
+#ifndef _ASM_X86_SECCOMP_H
+#define _ASM_X86_SECCOMP_H
+#include <asm/unistd.h>
 #ifdef CONFIG_X86_32
-# include <asm/seccomp_32.h>
+#define __NR_seccomp_sigreturn          __NR_sigreturn
-#else
-# include <asm/seccomp_64.h>
 #endif
+#ifdef CONFIG_COMPAT
+#include <asm/ia32_unistd.h>
+#define __NR_seccomp_read_32            __NR_ia32_read
+#define __NR_seccomp_write_32           __NR_ia32_write
+#define __NR_seccomp_exit_32            __NR_ia32_exit
+#define __NR_seccomp_sigreturn_32       __NR_ia32_sigreturn
+#endif
+#include <asm-generic/seccomp.h>
+#endif /* _ASM_X86_SECCOMP_H */
diff --git a/arch/x86/include/asm/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h
deleted file mode 100644
index b811d6f5780c..000000000000
--- a/arch/x86/include/asm/seccomp_32.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_X86_SECCOMP_32_H
-#define _ASM_X86_SECCOMP_32_H
-#include <linux/unistd.h>
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_sigreturn
-#endif /* _ASM_X86_SECCOMP_32_H */
diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h
deleted file mode 100644
index 84ec1bd161a5..000000000000
--- a/arch/x86/include/asm/seccomp_64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_X86_SECCOMP_64_H
-#define _ASM_X86_SECCOMP_64_H
-#include <linux/unistd.h>
-#include <asm/ia32_unistd.h>
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-#define __NR_seccomp_read_32 __NR_ia32_read
-#define __NR_seccomp_write_32 __NR_ia32_write
-#define __NR_seccomp_exit_32 __NR_ia32_exit
-#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
-#endif /* _ASM_X86_SECCOMP_64_H */

diff --git a/arch/x86/include/asm/seccomp.h b/arch/x86/include/asm/seccomp.h index 0f3d7f099224..0c8c7c8861b4 100644 --- a/arch/x86/include/asm/seccomp.h +++ b/arch/x86/include/asm/seccomp.h
@@ -1,5 +1,20 @@
		1	#ifndef _ASM_X86_SECCOMP_H
		2	#define _ASM_X86_SECCOMP_H
		3
		4	#include <asm/unistd.h>
		5
1	#ifdef CONFIG_X86_32	6	#ifdef CONFIG_X86_32
2	# include <asm/seccomp_32.h>	7	#define __NR_seccomp_sigreturn __NR_sigreturn
3	#else
4	# include <asm/seccomp_64.h>
5	#endif	8	#endif
		9
		10	#ifdef CONFIG_COMPAT
		11	#include <asm/ia32_unistd.h>
		12	#define __NR_seccomp_read_32 __NR_ia32_read
		13	#define __NR_seccomp_write_32 __NR_ia32_write
		14	#define __NR_seccomp_exit_32 __NR_ia32_exit
		15	#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
		16	#endif
		17
		18	#include <asm-generic/seccomp.h>
		19
		20	#endif /* _ASM_X86_SECCOMP_H */


diff --git a/arch/x86/include/asm/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h deleted file mode 100644 index b811d6f5780c..000000000000 --- a/arch/x86/include/asm/seccomp_32.h +++ /dev/null
@@ -1,11 +0,0 @@
1	#ifndef _ASM_X86_SECCOMP_32_H
2	#define _ASM_X86_SECCOMP_32_H
3
4	#include <linux/unistd.h>
5
6	#define __NR_seccomp_read __NR_read
7	#define __NR_seccomp_write __NR_write
8	#define __NR_seccomp_exit __NR_exit
9	#define __NR_seccomp_sigreturn __NR_sigreturn
10
11	#endif /* _ASM_X86_SECCOMP_32_H */


diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h deleted file mode 100644 index 84ec1bd161a5..000000000000 --- a/arch/x86/include/asm/seccomp_64.h +++ /dev/null
@@ -1,17 +0,0 @@
1	#ifndef _ASM_X86_SECCOMP_64_H
2	#define _ASM_X86_SECCOMP_64_H
3
4	#include <linux/unistd.h>
5	#include <asm/ia32_unistd.h>
6
7	#define __NR_seccomp_read __NR_read
8	#define __NR_seccomp_write __NR_write
9	#define __NR_seccomp_exit __NR_exit
10	#define __NR_seccomp_sigreturn __NR_rt_sigreturn
11
12	#define __NR_seccomp_read_32 __NR_ia32_read
13	#define __NR_seccomp_write_32 __NR_ia32_write
14	#define __NR_seccomp_exit_32 __NR_ia32_exit
15	#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
16
17	#endif /* _ASM_X86_SECCOMP_64_H */