diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-01-27 11:55:26 -0800 |
|---|---|---|
| committer | Tim Gardner <tim.gardner@canonical.com> | 2012-03-19 11:29:33 -0600 |
| commit | 19ece28e82d4bcac573470f1e0b321fba22a095f (patch) | |
| tree | ed82b85e7c4484fde222893ecab694565090412d /arch | |
| parent | faad7c28b0c94f0cb59ac41484c22e4a38941ab0 (diff) | |
Revert "CHROMIUM: x86: add HAVE_SECCOMP_FILTER and seccomp_execve"
This reverts commit 8d1ac80a95b1168c7f4f0f76ebd4e886a70175ea.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/ia32_unistd.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/seccomp_64.h | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 68696215b6a..5d55dcb2b76 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -64,7 +64,6 @@ config X86 select HAVE_TEXT_POKE_SMP select HAVE_GENERIC_HARDIRQS select HAVE_SPARSE_IRQ - select HAVE_SECCOMP_FILTER select SPARSE_IRQ select GENERIC_FIND_FIRST_BIT select GENERIC_IRQ_PROBE diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h index 8ed2922b835..976f6ecd2ce 100644 --- a/arch/x86/include/asm/ia32_unistd.h +++ b/arch/x86/include/asm/ia32_unistd.h @@ -12,7 +12,6 @@ #define __NR_ia32_exit 1 #define __NR_ia32_read 3 #define __NR_ia32_write 4 -#define __NR_ia32_execve 11 #define __NR_ia32_sigreturn 119 #define __NR_ia32_rt_sigreturn 173 diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h index 85c42197517..84ec1bd161a 100644 --- a/arch/x86/include/asm/seccomp_64.h +++ b/arch/x86/include/asm/seccomp_64.h @@ -8,12 +8,10 @@ #define __NR_seccomp_write __NR_write #define __NR_seccomp_exit __NR_exit #define __NR_seccomp_sigreturn __NR_rt_sigreturn -#define __NR_seccomp_execve __NR_execve #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 -#define __NR_seccomp_execve_32 __NR_ia32_execve #endif /* _ASM_X86_SECCOMP_64_H */ |