1 files changed, 24 insertions, 3 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cb992c3d6b71..5131d50f851a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -48,6 +48,9 @@ config GENERIC_HWEIGHT
 config GENERIC_HARDIRQS
         def_bool y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+        def_bool y
+
 config GENERIC_IRQ_PROBE
         def_bool y
 
@@ -63,6 +66,10 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
         def_bool n
 
+config GENERIC_LOCKBREAK
+        def_bool y
+        depends on SMP && PREEMPT
+
 config SYS_SUPPORTS_PM
         bool
 
@@ -94,9 +101,6 @@ config ARCH_HAS_ILOG2_U64
 config ARCH_NO_VIRT_TO_BUS
         def_bool y
 
-config ARCH_SUPPORTS_AOUT
-        def_bool y
-
 config IO_TRAPPED
         bool
 
@@ -483,6 +487,23 @@ config CRASH_DUMP
 
           For more details see Documentation/kdump/kdump.txt
 
+config SECCOMP
+        bool "Enable seccomp to safely compute untrusted bytecode"
+        depends on PROC_FS
+        default y
+        help
+          This kernel feature is useful for number crunching applications
+          that may need to compute untrusted bytecode during their
+          execution. By using pipes or other transports made available to
+          the process as file descriptors supporting the read/write
+          syscalls, it's possible to isolate those applications in
+          their own address space using seccomp. Once seccomp is
+          enabled via prctl, it cannot be disabled and the task is only
+          allowed to execute a few safe syscalls defined by each seccomp
+          mode.
+
+          If unsure, say N.
+
 config SMP
         bool "Symmetric multi-processing support"
         depends on SYS_SUPPORTS_SMP