Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  scsi: fix dependency bug in aic7 Makefile
  kbuild: add svn revision information to setlocalversion
  kbuild: do not warn about __*init/__*exit symbols being exported
  Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
  Add HAVE_KPROBES
  Add HAVE_OPROFILE
  Create arch/Kconfig
  Fix ARM to play nicely with generic Instrumentation menu
  kconfig: ignore select of unknown symbol
  kconfig: mark config as changed when loading an alternate config
  kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
  Remove __INIT_REFOK and __INITDATA_REFOK
  kbuild: print only total number of section mismatces found

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0d8a5a4a789d..0d385be682db 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -81,7 +81,7 @@ config HEADERS_CHECK
 
 config DEBUG_SECTION_MISMATCH
         bool "Enable full Section mismatch analysis"
-        default n
+        depends on UNDEFINED
         help
           The section mismatch analysis checks if there are illegal
           references from one section to another section.
@@ -90,19 +90,19 @@ config DEBUG_SECTION_MISMATCH
           most likely result in an oops.
           In the code functions and variables are annotated with
           __init, __devinit etc. (see full list in include/linux/init.h)
-          which result in the code/data being placed in specific sections.
-          The section mismatch anaylsis are always done after a full
-          kernel build but enabling this options will in addition
+          which results in the code/data being placed in specific sections.
+          The section mismatch analysis is always done after a full
+          kernel build but enabling this option will in addition
           do the following:
           - Add the option -fno-inline-functions-called-once to gcc
             When inlining a function annotated __init in a non-init
-            function we would loose the section information and thus
+            function we would lose the section information and thus
             the analysis would not catch the illegal reference.
-            This options tell gcc to inline less but will also
+            This option tells gcc to inline less but will also
             result in a larger kernel.
           - Run the section mismatch analysis for each module/built-in.o
             When we run the section mismatch analysis on vmlinux.o we
-            looses valueable information about where the mismatch was
+            lose valueble information about where the mismatch was
             introduced.
             Running the analysis for each module/built-in.o file
             will tell where the mismatch happens much closer to the