summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/seccomp_32.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/x86/include/asm/seccomp_32.h
parent0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff)
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff)
downloadop-kernel-dev-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
op-kernel-dev-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.gz
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/x86/include/asm/seccomp_32.h')
-rw-r--r--arch/x86/include/asm/seccomp_32.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h
index a6ad87b..b811d6f 100644
--- a/arch/x86/include/asm/seccomp_32.h
+++ b/arch/x86/include/asm/seccomp_32.h
@@ -1,12 +1,6 @@
#ifndef _ASM_X86_SECCOMP_32_H
#define _ASM_X86_SECCOMP_32_H
-#include <linux/thread_info.h>
-
-#ifdef TIF_32BIT
-#error "unexpected TIF_32BIT on i386"
-#endif
-
#include <linux/unistd.h>
#define __NR_seccomp_read __NR_read
OpenPOWER on IntegriCloud