Merge git://git.infradead.org/~kmpark/onenand-mtd-2.6

[powerpc.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f5becd2..dcc96a8 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config ARCH
+       string
+       option env="ARCH"
+
+config KERNELVERSION
+       string
+       option env="KERNELVERSION"
+
 config DEFCONFIG_LIST
        string
        depends on !UML
@@ -238,7 +246,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64)
+       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
@@ -763,3 +771,39 @@ source "block/Kconfig"
 
 config PREEMPT_NOTIFIERS
        bool
+
+choice
+       prompt "RCU implementation type:"
+       default CLASSIC_RCU
+       help
+         This allows you to choose either the classic RCU implementation
+         that is designed for best read-side performance on non-realtime
+         systems, or the preemptible RCU implementation for best latency
+         on realtime systems.  Note that some kernel preemption modes
+         will restrict your choice.
+
+         Select the default if you are unsure.
+
+config CLASSIC_RCU
+       bool "Classic RCU"
+       help
+         This option selects the classic RCU implementation that is
+         designed for best read-side performance on non-realtime
+         systems.
+
+         Say Y if you are unsure.
+
+config PREEMPT_RCU
+       bool "Preemptible RCU"
+       depends on PREEMPT
+       help
+         This option reduces the latency of the kernel by making certain
+         RCU sections preemptible. Normally RCU code is non-preemptible, if
+         this option is selected then read-only RCU sections become
+         preemptible. This helps latency, but may expose bugs due to
+         now-naive assumptions about each RCU read-side critical section
+         remaining on a given CPU through its execution.
+
+         Say N if you are unsure.
+
+endchoice