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

4 files changed, 28 insertions, 15 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 50e61c411bc0..734cf4f3131e 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -821,6 +821,7 @@ static void conf_load(void)
                                 return;
                         if (!conf_read(dialog_input_result)) {
                                 set_config_filename(dialog_input_result);
+                                sym_set_change_count(1);
                                 return;
                         }
                         show_textbox(NULL, _("File does not exist!"), 5, 38);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index fdad17367f61..606ceb9e746e 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -203,12 +203,9 @@ void sym_check_prop(struct symbol *sym)
                                 prop_warn(prop,
                                     "config symbol '%s' uses select, but is "
                                     "not boolean or tristate", sym->name);
-                        else if (sym2->type == S_UNKNOWN)
-                                prop_warn(prop,
-                                    "'select' used by config symbol '%s' "
-                                    "refers to undefined symbol '%s'",
-                                    sym->name, sym2->name);
-                        else if (sym2->type != S_BOOLEAN && sym2->type != S_TRISTATE)
+                        else if (sym2->type != S_UNKNOWN &&
+                                 sym2->type != S_BOOLEAN &&
+                                 sym2->type != S_TRISTATE)
                                 prop_warn(prop,
                                     "'%s' has wrong type. 'select' only "
                                     "accept arguments of boolean and "
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f8efc93eb700..5d546466e6b1 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -870,7 +870,7 @@ const struct sectioncheck sectioncheck[] = {
 /* Do not export init/exit functions or data */
 {
         .fromsec = { "__ksymtab*", NULL },
-        .tosec   = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL },
+        .tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
         .mismatch = EXPORT_TO_INIT_EXIT
 }
 };
@@ -1125,15 +1125,15 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
         to = to_is_func ? "function" : "variable";
         to_p = to_is_func ? "()" : "";
 
+        sec_mismatch_count++;
+        if (!sec_mismatch_verbose)
+                return;
+
         fprintf(stderr, "WARNING: %s(%s+0x%llx): Section mismatch in"
                         " reference from the %s %s%s to the %s %s:%s%s\n",
                         modname, fromsec, fromaddr, from, fromsym, from_p,
                         to, tosec, tosym, to_p);
 
-        sec_mismatch_count++;
-        if (!sec_mismatch_verbose)
-                return;
-
         switch (mismatch) {
         case TEXT_TO_INIT:
                 fprintf(stderr,
@@ -1939,10 +1939,9 @@ int main(int argc, char **argv)
                 write_dump(dump_write);
         if (sec_mismatch_count && !sec_mismatch_verbose)
                 fprintf(stderr, "modpost: Found %d section mismatch(es).\n"
-                        "To see additional details select \"Enable full "
-                        "Section mismatch analysis\"\n"
-                        "in the Kernel Hacking menu "
-                        "(CONFIG_SECTION_MISMATCH).\n", sec_mismatch_count);
+                        "To see full details build your kernel with:\n"
+                        "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+                        sec_mismatch_count);
 
         return err;
 }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 52f032e409a3..1c1bdaf7348a 100644..100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -45,3 +45,19 @@ if hgid=`hg id 2>/dev/null`; then
         # All done with mercurial
         exit
 fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null | grep '^Revision'`; then
+        rev=`echo $rev | awk '{print $NF}'`
+        changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
+
+        # Are there uncommitted changes?
+        if [ $changes != 0 ]; then
+                printf -- '-svn%s%s%s' "$rev" -dirty "$changes"
+        else
+                printf -- '-svn%s' "$rev"
+        fi
+
+        # All done with svn
+        exit
+fi