4 files changed, 21 insertions, 17 deletions

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 6408fefae083..891cd9ce9ba2 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -86,7 +86,7 @@ struct symbol {
         struct expr_value rev_dep;
 };
 
-#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
+#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
 
 #define SYMBOL_CONST      0x0001  /* symbol is const */
 #define SYMBOL_CHECK      0x0008  /* used during dependency checking */
@@ -108,8 +108,7 @@ struct symbol {
 #define SYMBOL_DEF4       0x80000  /* symbol.def[S_DEF_4] is valid */
 
 #define SYMBOL_MAXLENGTH        256
-#define SYMBOL_HASHSIZE         257
-#define SYMBOL_HASHMASK         0xff
+#define SYMBOL_HASHSIZE         9973
 
 /* A property represent the config options that can be associated
  * with a config "symbol".
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 6c8fbbb66ebc..9ee3923117ee 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;
         }
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 8a0867a32b0f..7df3264c3f3d 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;
 
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 361b54318c8d..258f16608ec0 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -27,7 +27,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;