Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4381006..c8b2624 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,5 +1,6 @@
 config DEFCONFIG_LIST
        string
 config DEFCONFIG_LIST
        string

+       depends on !UML

        option defconfig_list
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        option defconfig_list
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"


@@ -92,7 +93,7 @@ config LOCALVERSION_AUTO
 
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
 
 config SWAP
        bool "Support for paging of anonymous memory (swap)"

-       depends on MMU
+       depends on MMU && BLOCK

        default y
        help
          This option allows you to choose whether you want to have support
        default y
        help
          This option allows you to choose whether you want to have support


@@ -115,6 +116,15 @@ config SYSVIPC
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 
          section 6.4 of the Linux Programmer's Guide, available from
          <http://www.tldp.org/guides.html>.
 

+config IPC_NS
+       bool "IPC Namespaces"
+       depends on SYSVIPC
+       default n
+       help
+         Support ipc namespaces.  This allows containers, i.e. virtual
+         environments, to use ipc namespaces to provide different ipc
+         objects for different servers.  If unsure, say N.
+

 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL
 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET && EXPERIMENTAL


@@ -182,6 +192,14 @@ config TASK_DELAY_ACCT
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config UTS_NS
+       bool "UTS Namespaces"
+       default n
+       help
+         Support uts namespaces.  This allows containers, i.e.
+         vservers, to use uts namespaces to provide different
+         uts info for different servers.  If unsure, say N.
+

 config AUDIT
        bool "Auditing support"
        depends on NET
 config AUDIT
        bool "Auditing support"
        depends on NET


@@ -202,7 +220,7 @@ config AUDITSYSCALL
          ensure that INOTIFY is configured.
 
 config IKCONFIG
          ensure that INOTIFY is configured.
 
 config IKCONFIG

-       bool "Kernel .config support"
+       tristate "Kernel .config support"

        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation
        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation


@@ -257,6 +275,18 @@ config CC_OPTIMIZE_FOR_SIZE
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config TASK_XACCT
+       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+       depends on TASKSTATS
+       help
+         Collect extended task accounting data and send the data
+         to userland for processing over the taskstats interface.
+
+         Say N if unsure.
+
+config SYSCTL
+       bool
+

 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help


@@ -272,11 +302,8 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
        help
          This enables the legacy 16-bit UID syscall wrappers.
 

-config SYSCTL
-       bool
-

 config SYSCTL_SYSCALL
 config SYSCTL_SYSCALL

-       bool "Sysctl syscall support"
+       bool "Sysctl syscall support" if EMBEDDED

        default n
        select SYSCTL
        ---help---
        default n
        select SYSCTL
        ---help---


@@ -285,11 +312,11 @@ config SYSCTL_SYSCALL
          and use.  The interface in /proc/sys is now the primary and what
          everyone uses.
 
          and use.  The interface in /proc/sys is now the primary and what
          everyone uses.
 

-         Nothing has been using the binary sysctl interface for some time
+         Nothing has been using the binary sysctl interface for some

          time now so nothing should break if you disable sysctl syscall
          time now so nothing should break if you disable sysctl syscall

-         support, and you kernel will get marginally smaller.
+         support, and your kernel will get marginally smaller.

 
 

-         Unless you have an application that uses the sys_syscall interface
+         Unless you have an application that uses the sys_sysctl interface

          you should probably say N here.
 
 config KALLSYMS
          you should probably say N here.
 
 config KALLSYMS