diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 04:58:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 04:58:51 -0700 |
| commit | 890fa45d01eb89304ef26564cc310747f56b5438 (patch) | |
| tree | b07a2fd166cb26b3ff0a8a4b275e77c296af4557 /include/linux/stringhash.h | |
| parent | usb-misc: sisusbvga: fix spelling mistake: "asymmeric" -> "asymmetric" (diff) | |
| parent | Linux v4.17-rc3 (diff) | |
Merge 4.17-rc3 into usb-next
This resolves the merge issue with drivers/usb/core/hcd.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/stringhash.h')
| -rw-r--r-- | include/linux/stringhash.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/stringhash.h b/include/linux/stringhash.h index e8f0f852968f..c0c5c5b73dc0 100644 --- a/include/linux/stringhash.h +++ b/include/linux/stringhash.h @@ -50,9 +50,9 @@ partial_name_hash(unsigned long c, unsigned long prevhash) * losing bits). This also has the property (wanted by the dcache) * that the msbits make a good hash table index. */ -static inline unsigned long end_name_hash(unsigned long hash) +static inline unsigned int end_name_hash(unsigned long hash) { - return __hash_32((unsigned int)hash); + return hash_long(hash, 32); } /* |