mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 01:10:04 +00:00
Code Issues Releases Wiki Activity

x86, hash: Simplify switch, add __init annotation

Browse source 
Minor cleanups:

- simplify switch statement
- add __init annotation to setup_arch_fast_hash()

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/530F09CE020000780011FBEF@nat28.tlf.novell.com
Cc: Francesco Fusco <ffusco@redhat.com>
Cc: Thomas Graf <tgraf@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Jan Beulich 2014-02-27 08:47:58 +00:00 committed by H. Peter Anvin
parent c5cdfdf909
commit 7a5917e978
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/x86/lib/hash.c
View file

@ -32,6 +32,7 @@
*/
#include <linux/hash.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <asm/cpufeature.h>
@ -55,17 +56,16 @@ static u32 intel_crc4_2_hash(const void *data, u32 len, u32 seed)
for (i = 0; i < len / 4; i++)
seed = crc32_u32(seed, *p32++);
switch (3 - (len & 0x03)) {
case 0:
switch (len & 3) {
case 3:
tmp |= *((const u8 *) p32 + 2) << 16;
/* fallthrough */
case 1:
case 2:
tmp |= *((const u8 *) p32 + 1) << 8;
/* fallthrough */
case 2:
case 1:
tmp |= *((const u8 *) p32);
seed = crc32_u32(seed, tmp);
default:
break;
}
@ -83,7 +83,7 @@ static u32 intel_crc4_2_hash2(const u32 *data, u32 len, u32 seed)
return seed;
}
void setup_arch_fast_hash(struct fast_hash_ops *ops)
void __init setup_arch_fast_hash(struct fast_hash_ops *ops)
{
if (cpu_has_xmm4_2) {
ops->hash = intel_crc4_2_hash;