linux-kernel - [tip:x86/hash] x86, hash: Simplify switch, add _

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 19 Mar 2014 16:48:58 -0700
From:	tip-bot for Jan Beulich <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	ffusco@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
	mingo@...nel.org, dborkman@...hat.com, jbeulich@...e.com,
	davem@...emloft.net, tgraf@...hat.com, JBeulich@...e.com,
	tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/hash] x86, hash: Simplify switch, add __init annotation

Commit-ID:  d31abcbca0e076f2a136d214f409b55bf149fade
Gitweb:     http://git.kernel.org/tip/d31abcbca0e076f2a136d214f409b55bf149fade
Author:     Jan Beulich <JBeulich@...e.com>
AuthorDate: Thu, 27 Feb 2014 08:47:58 +0000
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Wed, 19 Mar 2014 16:26:44 -0700

x86, hash: Simplify switch, add __init annotation

Minor cleanups:

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

Signed-off-by: Jan Beulich <jbeulich@...e.com>
Link: http://lkml.kernel.org/r/530F09CE020000780011FBEF@nat28.tlf.novell.com
Cc: Francesco Fusco <ffusco@...hat.com>
Cc: Daniel Borkmann <dborkman@...hat.com>
Cc: Thomas Graf <tgraf@...hat.com>
Cc: David S. Miller <davem@...emloft.net>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
 arch/x86/lib/hash.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/lib/hash.c b/arch/x86/lib/hash.c
index ac628aa..ff4fa51 100644
--- a/arch/x86/lib/hash.c
+++ b/arch/x86/lib/hash.c
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/