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

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kconfig: fix typo in change count initialization
  kconfig: recenter menuconfig
  kconfig: revert conf behaviour change
  kconfig: fix default value for choice input
  kbuild: fix NULL dereference in scripts/mod/modpost.c
  kbuild: fix mode of checkstack.pl and other files.
  kbuild: rebuild initramfs if content of initramfs changes
  kbuild: properly pass options to hostcc when doing make O=..
  kbuild: modules_install for external modules must not remove existing modules
  kbuild: fix make dir/
  ver_linux: don't print reiser4progs version if none found
  kbuild: mips: fix sed regexp to generate asm-offset.h
  kbuild: fix building single targets with make O=.. single-target
  kbuild: use relative path to -I
  kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
  kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree
  kbuild: fix garbled text in modules.txt

1 files changed, 3 insertions, 18 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 10eeae53d827..ae5ab981bb1d 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -63,20 +63,6 @@ static void check_stdin(void)
         }
 }
 
-static char *fgets_check_stream(char *s, int size, FILE *stream)
-{
-        char *ret = fgets(s, size, stream);
-
-        if (ret == NULL && feof(stream)) {
-                printf(_("aborted!\n\n"));
-                printf(_("Console input is closed. "));
-                printf(_("Run 'make oldconfig' to update configuration.\n\n"));
-                exit(1);
-        }
-
-        return ret;
-}
-
 static void conf_askvalue(struct symbol *sym, const char *def)
 {
         enum symbol_type type = sym_get_type(sym);
@@ -114,7 +100,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 check_stdin();
         case ask_all:
                 fflush(stdout);
-                fgets_check_stream(line, 128, stdin);
+                fgets(line, 128, stdin);
                 return;
         case set_default:
                 printf("%s\n", def);
@@ -328,8 +314,7 @@ static int conf_choice(struct menu *menu)
                 printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                 def_sym = sym_get_choice_value(sym);
                 cnt = def = 0;
-                line[0] = '0';
-                line[1] = 0;
+                line[0] = 0;
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
@@ -370,7 +355,7 @@ static int conf_choice(struct menu *menu)
                         check_stdin();
                 case ask_all:
                         fflush(stdout);
-                        fgets_check_stream(line, 128, stdin);
+                        fgets(line, 128, stdin);
                         strip(line);
                         if (line[0] == '?') {
                                 printf("\n%s\n", menu->sym->help ?