Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 338d82aeda673f91d54cb2b817003a5b60e720a6..d5a1a1228fab05632107e53152c954c0033d10f9 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -77,6 +77,22 @@ config LOCALVERSION
          object and source tree, in that order.  Your total string can
          be a maximum of 64 characters.
 
+config LOCALVERSION_AUTO
+       bool "Automatically append version information to the version string"
+       default y
+       help
+         This will try to automatically determine if the current tree is a
+         release tree by looking for git tags that
+         belong to the current top of tree revision.
+
+         A string of the format -gxxxxxxxx will be added to the localversion
+         if a git based tree is found.  The string generated by this will be
+         appended after any matching localversion* files, and after the value
+         set in CONFIG_LOCALVERSION
+
+         Note: This requires Perl, and a git repository, but not necessarily
+         the git or cogito tools to be installed.
+
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
        depends on MMU
@@ -164,6 +180,7 @@ config SYSCTL
 
 config AUDIT
        bool "Auditing support"
+       depends on NET
        default y if SECURITY_SELINUX
        help
          Enable auditing infrastructure that can be used with another
@@ -173,7 +190,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML)
+       depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML || SPARC64)
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
@@ -230,13 +247,15 @@ config CPUSETS
        bool "Cpuset support"
        depends on SMP
        help
-         This options will let you create and manage CPUSET's which
+         This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and
          Memory Nodes and assigning tasks to run only within those sets.
          This is primarily useful on large SMP or NUMA systems.
 
          Say N if unsure.
 
+source "usr/Kconfig"
+
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
@@ -259,8 +278,8 @@ config KALLSYMS_ALL
        help
           Normally kallsyms only contains the symbols of functions, for nicer
           OOPS messages.  Some debuggers can use kallsyms for other
-          symbols too: say Y here to include all symbols, and you
-          don't care about adding 300k to the size of your kernel.
+          symbols too: say Y here to include all symbols, if you need them 
+          and you don't care about adding 300k to the size of your kernel.
 
           Say N.
 
@@ -275,6 +294,27 @@ config KALLSYMS_EXTRA_PASS
           reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
           you wait for kallsyms to be fixed.
 
+
+config PRINTK
+       default y
+       bool "Enable support for printk" if EMBEDDED
+       help
+         This option enables normal printk support. Removing it
+         eliminates most of the message strings from the kernel image
+         and makes the kernel more or less silent. As this makes it
+         very difficult to diagnose system problems, saying N here is
+         strongly discouraged.
+
+config BUG
+       bool "BUG() support" if EMBEDDED
+       default y
+       help
+          Disabling this option eliminates support for BUG and WARN, reducing
+          the size of your kernel image and potentially quietly ignoring
+          numerous fatal conditions. You should only consider disabling this
+          option for embedded systems with no facilities for reporting errors.
+          Just say Y.
+
 config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EMBEDDED
@@ -421,7 +461,7 @@ config OBSOLETE_MODPARM
 
 config MODVERSIONS
        bool "Module versioning support (EXPERIMENTAL)"
-       depends on MODULES && EXPERIMENTAL && !UML
+       depends on MODULES && EXPERIMENTAL
        help
          Usually, you have to use modules compiled with your kernel.
          Saying Y here makes it sometimes possible to use modules