Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (53 commits)
  .gitignore: ignore *.lzma files
  kbuild: add generic --set-str option to scripts/config
  kbuild: simplify argument loop in scripts/config
  kbuild: handle non-existing options in scripts/config
  kallsyms: generalize text region handling
  kallsyms: support kernel symbols in Blackfin on-chip memory
  documentation: make version fix
  kbuild: fix a compile warning
  gitignore: Add GNU GLOBAL files to top .gitignore
  kbuild: fix delay in setlocalversion on readonly source
  README: fix misleading pointer to the defconf directory
  vmlinux.lds.h update
  kernel-doc: cleanup perl script
  Improve vmlinux.lds.h support for arch specific linker scripts
  kbuild: fix headers_exports with boolean expression
  kbuild/headers_check: refine extern check
  kbuild: fix "Argument list too long" error for "make headers_check",
  ignore *.patch files
  Remove bashisms from scripts
  menu: fix embedded menu presentation
  ...

1 files changed, 12 insertions, 8 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 273d73888f9d..a04da3459f0f 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -41,6 +41,13 @@ const char *conf_get_configname(void)
         return name ? name : ".config";
 }
 
+const char *conf_get_autoconfig_name(void)
+{
+        char *name = getenv("KCONFIG_AUTOCONFIG");
+
+        return name ? name : "include/config/auto.conf";
+}
+
 static char *conf_expand_value(const char *in)
 {
         struct symbol *sym;
@@ -555,15 +562,14 @@ int conf_write(const char *name)
 
 int conf_split_config(void)
 {
-        char *name, path[128];
+        const char *name;
+        char path[128];
         char *s, *d, c;
         struct symbol *sym;
         struct stat sb;
         int res, i, fd;
 
-        name = getenv("KCONFIG_AUTOCONFIG");
-        if (!name)
-                name = "include/config/auto.conf";
+        name = conf_get_autoconfig_name();
         conf_read_simple(name, S_DEF_AUTO);
 
         if (chdir("include/config"))
@@ -670,7 +676,7 @@ int conf_write_autoconf(void)
 {
         struct symbol *sym;
         const char *str;
-        char *name;
+        const char *name;
         FILE *out, *out_h;
         time_t now;
         int i, l;
@@ -773,9 +779,7 @@ int conf_write_autoconf(void)
                 name = "include/linux/autoconf.h";
         if (rename(".tmpconfig.h", name))
                 return 1;
-        name = getenv("KCONFIG_AUTOCONFIG");
-        if (!name)
-                name = "include/config/auto.conf";
+        name = conf_get_autoconfig_name();
         /*
          * This must be the last step, kbuild has a dependency on auto.conf
          * and this marks the successful completion of the previous steps.