Pull sim-fixes into release branch

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index b1091d7542cea080abe6367bb2b4f3fc14ea680f..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.
 
          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
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
        depends on MMU


@@ -174,7 +190,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"

-       depends on AUDIT && (X86 || PPC || 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
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that


@@ -231,13 +247,15 @@ config CPUSETS
        bool "Cpuset support"
        depends on SMP
        help
        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.
 
          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
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help


@@ -260,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
        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.
 
 
           Say N.