---

yaml --- r: 361570 b: refs/heads/master c: 65c1055 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · d7d8d58 · d7d8d58
1 parent c8e8a23
commit d7d8d58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -15,6 +15,7 @@
  */
 
 #include <asm/types.h>
+#include <linux/compiler.h>
 
 /* 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;