diff --git a/[refs] b/[refs] index 3087ae014568..b1fbae6e1935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0bf225db77d6b4f981ffe52c50fedb00cf1836c +refs/heads/master: 65c10553552b487a71bf5e4676743435046fae6f diff --git a/trunk/include/linux/hash.h b/trunk/include/linux/hash.h index 61c97ae22e01..f09a0ae4d858 100644 --- a/trunk/include/linux/hash.h +++ b/trunk/include/linux/hash.h @@ -15,6 +15,7 @@ */ #include +#include /* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */ #define GOLDEN_RATIO_PRIME_32 0x9e370001UL @@ -31,7 +32,7 @@ #error Wordsize not 32 or 64 #endif -static inline u64 hash_64(u64 val, unsigned int bits) +static __always_inline u64 hash_64(u64 val, unsigned int bits) { u64 hash = val;