Use __jhash_mix() to mix the class_idx into the class_key. This function provides better mixing than the previously used, home grown mix function. Leave hashing to the professionals :-)
Unified · Split
| @@ -46,6 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | #include <linux/gfp.h> |
| 47 | 47 | #include <linux/kmemcheck.h> |
| 48 | 48 | #include <linux/random.h> |
| 49 | +#include <linux/jhash.h> | |
| 49 | 50 | |
| 50 | 51 | #include <asm/sections.h> |
| 51 | 52 | |
| @@ -309,10 +310,14 @@ static struct hlist_head chainhash_table[CHAINHASH_SIZE]; · 257 unmodified lines | ||
| 309 | 310 | * It's a 64-bit hash, because it's important for the keys to be |
| 310 | 311 | * unique. |
| 311 | 312 | */ |
| 312 | −#define iterate_chain_key(key1, key2) \ | |
| 313 | − (((key1) << MAX_LOCKDEP_KEYS_BITS) ^ \ | |
| 314 | − ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \ | |
| 315 | − (key2)) | |
| 313 | +static inline u64 iterate_chain_key(u64 key, u32 idx) | |
| 314 | +{ | |
| 315 | + u32 k0 = key, k1 = key >> 32; | |
| 316 | + | |
| 317 | + __jhash_mix(idx, k0, k1); /* Macro that modifies arguments! */ | |
| 318 | + | |
| 319 | + return k0 | (u64)k1 << 32; | |
| 320 | +} | |
| 316 | 321 | |
| 317 | 322 | void lockdep_off(void) |
| 318 | 323 | { |