Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...

1 files changed, 19 insertions, 6 deletions

diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 6e9dcd59aa87..32a9eefd842c 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -104,7 +104,7 @@ static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
 static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
 
-struct symbol *symbol_hash[257];
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 
 static struct menu *current_menu, *current_entry;
 
@@ -2220,7 +2220,7 @@ void conf_parse(const char *name)
         zconf_initscan(name);
 
         sym_init();
-        menu_init();
+        _menu_init();
         modules_sym = sym_lookup(NULL, 0);
         modules_sym->type = S_BOOLEAN;
         modules_sym->flags |= SYMBOL_AUTO;
@@ -2336,9 +2336,9 @@ static void print_symbol(FILE *out, struct menu *menu)
         struct property *prop;
 
         if (sym_is_choice(sym))
-                fprintf(out, "choice\n");
+                fprintf(out, "\nchoice\n");
         else
-                fprintf(out, "config %s\n", sym->name);
+                fprintf(out, "\nconfig %s\n", sym->name);
         switch (sym->type) {
         case S_BOOLEAN:
                 fputs("  boolean\n", out);
@@ -2384,6 +2384,21 @@ static void print_symbol(FILE *out, struct menu *menu)
                 case P_CHOICE:
                         fputs("  #choice value\n", out);
                         break;
+                case P_SELECT:
+                        fputs( "  select ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_RANGE:
+                        fputs( "  range ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_MENU:
+                        fputs( "  menu ", out);
+                        print_quoted_string(out, prop->text);
+                        fputc('\n', out);
+                        break;
                 default:
                         fprintf(out, "  unknown prop %d!\n", prop->type);
                         break;
@@ -2395,7 +2410,6 @@ static void print_symbol(FILE *out, struct menu *menu)
                         menu->help[len] = 0;
                 fprintf(out, "  help\n%s\n", menu->help);
         }
-        fputc('\n', out);
 }
 
 void zconfdump(FILE *out)
@@ -2428,7 +2442,6 @@ void zconfdump(FILE *out)
                                 expr_fprint(prop->visible.expr, out);
                                 fputc('\n', out);
                         }
-                        fputs("\n", out);
                 }
 
                 if (menu->list)