NLM: don't unlock on cancel requests

[safe/jmp/linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 11930fb..ba42f37 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -105,7 +105,6 @@ config SWAP
 
 config SYSVIPC
        bool "System V IPC"
-       depends on MMU
        ---help---
          Inter Process Communication is a suite of library functions and
          system calls which let processes (running programs) synchronize and
@@ -190,40 +189,13 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML || SPARC64)
+       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64)
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
          such as SELinux.
 
-config HOTPLUG
-       bool "Support for hot-pluggable devices" if !ARCH_S390
-       default ARCH_S390
-       help
-         This option is provided for the case where no in-kernel-tree
-         modules require HOTPLUG functionality, but a module built
-         outside the kernel tree does. Such modules require Y here.
-
-config KOBJECT_UEVENT
-       bool "Kernel Userspace Events"
-       depends on NET
-       default y
-       help
-         This option enables the kernel userspace event layer, which is a
-         simple mechanism for kernel-to-user communication over a netlink
-         socket.
-         The goal of the kernel userspace events layer is to provide a simple
-         and efficient events system, that notifies userspace about kobject
-         state changes. This will enable applications to just listen for
-         events instead of polling system devices and files.
-         Hotplug events (kobject addition and removal) are also available on
-         the netlink socket in addition to the execution of /sbin/hotplug if
-         CONFIG_HOTPLUG is enabled.
-
-         Say Y, unless you are building a system requiring minimal memory
-         consumption.
-
 config IKCONFIG
        bool "Kernel .config support"
        ---help---
@@ -256,6 +228,19 @@ config CPUSETS
 
 source "usr/Kconfig"
 
+config CC_OPTIMIZE_FOR_SIZE
+       bool "Optimize for size (Look out for broken compilers!)"
+       default y
+       depends on ARM || H8300 || EXPERIMENTAL
+       help
+         Enabling this option will pass "-Os" instead of "-O2" to gcc
+         resulting in a smaller kernel.
+
+         WARNING: some versions of gcc may generate incorrect code with this
+         option.  If problems are observed, a gcc upgrade may be needed.
+
+         If unsure, say N.
+
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
@@ -295,6 +280,15 @@ config KALLSYMS_EXTRA_PASS
           you wait for kallsyms to be fixed.
 
 
+config HOTPLUG
+       bool "Support for hot-pluggable devices" if EMBEDDED
+       default y
+       help
+         This option is provided for the case where no hotplug or uevent
+         capabilities is wanted by the kernel.  You should only consider
+         disabling this option for embedded systems that do not use modules, a
+         dynamic /dev tree, or dynamic device discovery.  Just say Y.
+
 config PRINTK
        default y
        bool "Enable support for printk" if EMBEDDED
@@ -338,18 +332,6 @@ config EPOLL
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
-config CC_OPTIMIZE_FOR_SIZE
-       bool "Optimize for size" if EMBEDDED
-       default y if ARM || H8300
-       help
-         Enabling this option will pass "-Os" instead of "-O2" to gcc
-         resulting in a smaller kernel.
-
-         WARNING: some versions of gcc may generate incorrect code with this
-         option.  If problems are observed, a gcc upgrade may be needed.
-
-         If unsure, say N.
-
 config SHMEM
        bool "Use full shmem filesystem" if EMBEDDED
        default y