Commit 5eaea851 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

modpost: replace tdb_hash() with hash_str() 



Use a helper available in scripts/include/hash.h.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 6b1fabce

scripts/mod/modpost.c

+3 −15
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <stdbool.h>

#include <errno.h>



#include <hash.h>

#include <hashtable.h>

#include <list.h>

#include <xalloc.h>
@@ -210,19 +211,6 @@ struct symbol { 


static HASHTABLE_DEFINE(symbol_hashtable, 1U << 10);



/* This is based on the hash algorithm from gdbm, via tdb */

static inline unsigned int tdb_hash(const char *name)

{

	unsigned value;	/* Used to compute the hash value.  */

	unsigned   i;	/* Used to cycle through random values. */



	/* Set the initial value from the key size. */

	for (value = 0x238F13AF * strlen(name), i = 0; name[i]; i++)

		value = (value + (((unsigned char *)name)[i] << (i*5 % 24)));



	return (1103515243 * value + 12345);

}



/**

 * Allocate a new symbols for use in the hash of exported symbols or

 * the list of unresolved symbols per module
@@ -240,7 +228,7 @@ static struct symbol *alloc_symbol(const char *name) 
/* For the hash of exported symbols */

static void hash_add_symbol(struct symbol *sym)

{

	hash_add(symbol_hashtable, &sym->hnode, tdb_hash(sym->name));

	hash_add(symbol_hashtable, &sym->hnode, hash_str(sym->name));

}



static void sym_add_unresolved(const char *name, struct module *mod, bool weak)
@@ -261,7 +249,7 @@ static struct symbol *sym_find_with_module(const char *name, struct module *mod) 
	if (name[0] == '.')

		name++;



	hash_for_each_possible(symbol_hashtable, s, hnode, tdb_hash(name)) {

	hash_for_each_possible(symbol_hashtable, s, hnode, hash_str(name)) {

		if (strcmp(s->name, name) == 0 && (!mod || s->module == mod))

			return s;

	}