diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/lib/hash.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/lib/hash.c b/arch/x86/lib/hash.c index ac628aa93a51..ff4fa51a5b1f 100644 --- a/arch/x86/lib/hash.c +++ b/arch/x86/lib/hash.c | |||
@@ -32,6 +32,7 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/hash.h> | 34 | #include <linux/hash.h> |
35 | #include <linux/init.h> | ||
35 | 36 | ||
36 | #include <asm/processor.h> | 37 | #include <asm/processor.h> |
37 | #include <asm/cpufeature.h> | 38 | #include <asm/cpufeature.h> |
@@ -55,17 +56,16 @@ static u32 intel_crc4_2_hash(const void *data, u32 len, u32 seed) | |||
55 | for (i = 0; i < len / 4; i++) | 56 | for (i = 0; i < len / 4; i++) |
56 | seed = crc32_u32(seed, *p32++); | 57 | seed = crc32_u32(seed, *p32++); |
57 | 58 | ||
58 | switch (3 - (len & 0x03)) { | 59 | switch (len & 3) { |
59 | case 0: | 60 | case 3: |
60 | tmp |= *((const u8 *) p32 + 2) << 16; | 61 | tmp |= *((const u8 *) p32 + 2) << 16; |
61 | /* fallthrough */ | 62 | /* fallthrough */ |
62 | case 1: | 63 | case 2: |
63 | tmp |= *((const u8 *) p32 + 1) << 8; | 64 | tmp |= *((const u8 *) p32 + 1) << 8; |
64 | /* fallthrough */ | 65 | /* fallthrough */ |
65 | case 2: | 66 | case 1: |
66 | tmp |= *((const u8 *) p32); | 67 | tmp |= *((const u8 *) p32); |
67 | seed = crc32_u32(seed, tmp); | 68 | seed = crc32_u32(seed, tmp); |
68 | default: | ||
69 | break; | 69 | break; |
70 | } | 70 | } |
71 | 71 | ||
@@ -83,7 +83,7 @@ static u32 intel_crc4_2_hash2(const u32 *data, u32 len, u32 seed) | |||
83 | return seed; | 83 | return seed; |
84 | } | 84 | } |
85 | 85 | ||
86 | void setup_arch_fast_hash(struct fast_hash_ops *ops) | 86 | void __init setup_arch_fast_hash(struct fast_hash_ops *ops) |
87 | { | 87 | { |
88 | if (cpu_has_xmm4_2) { | 88 | if (cpu_has_xmm4_2) { |
89 | ops->hash = intel_crc4_2_hash; | 89 | ops->hash = intel_crc4_2_hash; |