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, 18 insertions, 12 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 6c8fbbb66ebc..2e7a048e0cfc 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -651,12 +651,20 @@ bool sym_is_changable(struct symbol *sym)
         return sym->visible > sym->rev_dep.tri;
 }
 
+static unsigned strhash(const char *s)
+{
+        /* fnv32 hash */
+        unsigned hash = 2166136261U;
+        for (; *s; s++)
+                hash = (hash ^ *s) * 0x01000193;
+        return hash;
+}
+
 struct symbol *sym_lookup(const char *name, int flags)
 {
         struct symbol *symbol;
-        const char *ptr;
         char *new_name;
-        int hash = 0;
+        int hash;
 
         if (name) {
                 if (name[0] && !name[1]) {
@@ -666,12 +674,11 @@ struct symbol *sym_lookup(const char *name, int flags)
                         case 'n': return &symbol_no;
                         }
                 }
-                for (ptr = name; *ptr; ptr++)
-                        hash += *ptr;
-                hash &= 0xff;
+                hash = strhash(name) % SYMBOL_HASHSIZE;
 
                 for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
-                        if (!strcmp(symbol->name, name) &&
+                        if (symbol->name &&
+                            !strcmp(symbol->name, name) &&
                             (flags ? symbol->flags & flags
                                    : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE))))
                                 return symbol;
@@ -679,7 +686,7 @@ struct symbol *sym_lookup(const char *name, int flags)
                 new_name = strdup(name);
         } else {
                 new_name = NULL;
-                hash = 256;
+                hash = 0;
         }
 
         symbol = malloc(sizeof(*symbol));
@@ -697,7 +704,6 @@ struct symbol *sym_lookup(const char *name, int flags)
 struct symbol *sym_find(const char *name)
 {
         struct symbol *symbol = NULL;
-        const char *ptr;
         int hash = 0;
 
         if (!name)
@@ -710,12 +716,11 @@ struct symbol *sym_find(const char *name)
                 case 'n': return &symbol_no;
                 }
         }
-        for (ptr = name; *ptr; ptr++)
-                hash += *ptr;
-        hash &= 0xff;
+        hash = strhash(name) % SYMBOL_HASHSIZE;
 
         for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
-                if (!strcmp(symbol->name, name) &&
+                if (symbol->name &&
+                    !strcmp(symbol->name, name) &&
                     !(symbol->flags & SYMBOL_CONST))
                                 break;
         }
@@ -750,6 +755,7 @@ struct symbol **sym_re_search(const char *pattern)
                                 return NULL;
                         }
                 }
+                sym_calc_value(sym);
                 sym_arr[cnt++] = sym;
         }
         if (sym_arr)