From ac797b278ec0cc8edc0ceb9e8fc9ee90d739c081 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 23 Jul 2008 15:49:43 +0000
Subject: [PATCH] Reenable SECCOMP.

* debian/changelog: Update.
* debian/config/amd64/config, debian/config/i386/config,
  debian/config/mips/config, debian/config/mipsel/config,
  debian/config/powerpc/config, debian/config/sparc/config: Set SECCOMP.

svn path=/dists/trunk/linux-2.6/; revision=11885
---
 debian/changelog             | 2 ++
 debian/config/amd64/config   | 2 +-
 debian/config/i386/config    | 2 +-
 debian/config/mips/config    | 2 +-
 debian/config/mipsel/config  | 2 +-
 debian/config/powerpc/config | 2 +-
 debian/config/sparc/config   | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dacc773e7..5958cb447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,8 @@ linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low
   * Use control group as base for group CPU scheduler. This reenabled
     traditional nice behaviour. (closes: #489223)
   * Bump yaird dependencies to at least 0.0.13.
+  * Reenable SECCOMP. There is no longer additional overhead.
+    (closes: #474648)
 
   [ Christian T. Steigies ]
   * [m68k] enable SERIAL_CONSOLE for amiga and atari
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 4fe172e62..8415a0478 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -33,7 +33,7 @@ CONFIG_NODES_SHIFT=6
 CONFIG_MTRR=y
 # CONFIG_X86_PAT is not set
 CONFIG_EFI=y
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 395f51ffe..2de46d436 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -47,7 +47,7 @@ CONFIG_MTRR=y
 # CONFIG_X86_PAT is not set
 CONFIG_EFI=y
 # CONFIG_IRQBALANCE is not set
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
diff --git a/debian/config/mips/config b/debian/config/mips/config
index 1bb2b2927..247b043d0 100644
--- a/debian/config/mips/config
+++ b/debian/config/mips/config
@@ -1,7 +1,7 @@
 ##
 ## file: arch/mips/Kconfig
 ##
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 ##
 ## file: drivers/net/Kconfig
diff --git a/debian/config/mipsel/config b/debian/config/mipsel/config
index 1bb2b2927..247b043d0 100644
--- a/debian/config/mipsel/config
+++ b/debian/config/mipsel/config
@@ -1,7 +1,7 @@
 ##
 ## file: arch/mips/Kconfig
 ##
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 ##
 ## file: drivers/net/Kconfig
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index dee57b0ae..4c7bd5da7 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -11,7 +11,7 @@ CONFIG_KEXEC=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 CONFIG_PCI=y
 # CONFIG_ADVANCED_OPTIONS is not set
 
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index cb10c0e81..50ce00bf3 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -1,7 +1,7 @@
 ##
 ## file: arch/sparc64/Kconfig
 ##
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 CONFIG_PCI=y
 CONFIG_SUN_OPENPROMFS=m