* [PATCH v2 3/3] x86/hash: cleanup
@ 2014-02-27 8:47 Jan Beulich
2014-02-27 9:28 ` Daniel Borkmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jan Beulich @ 2014-02-27 8:47 UTC (permalink / raw)
To: mingo, tglx, Jan Beulich, hpa
Cc: davem, dborkman, ffusco, tgraf, linux-kernel
- simplify switch statement
- add __init annotation to setup_arch_fast_hash()
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Francesco Fusco <ffusco@redhat.com>
Cc: Daniel Borkmann <dborkman@redhat.com>
Cc: Thomas Graf <tgraf@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
---
arch/x86/lib/hash.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- 3.14-rc4-x86-hash-crc32.orig/arch/x86/lib/hash.c
+++ 3.14-rc4-x86-hash-crc32/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
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
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;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 3/3] x86/hash: cleanup
2014-02-27 8:47 [PATCH v2 3/3] x86/hash: cleanup Jan Beulich
@ 2014-02-27 9:28 ` Daniel Borkmann
2014-03-19 23:48 ` [tip:x86/hash] x86, hash: Simplify switch, add __init annotation tip-bot for Jan Beulich
2014-03-19 23:54 ` tip-bot for Jan Beulich
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2014-02-27 9:28 UTC (permalink / raw)
To: Jan Beulich; +Cc: mingo, tglx, hpa, davem, ffusco, tgraf, linux-kernel
On 02/27/2014 09:47 AM, Jan Beulich wrote:
> - simplify switch statement
> - add __init annotation to setup_arch_fast_hash()
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> Cc: Francesco Fusco <ffusco@redhat.com>
> Cc: Daniel Borkmann <dborkman@redhat.com>
> Cc: Thomas Graf <tgraf@redhat.com>
> Cc: David S. Miller <davem@davemloft.net>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/hash] x86, hash: Simplify switch, add __init annotation
2014-02-27 8:47 [PATCH v2 3/3] x86/hash: cleanup Jan Beulich
2014-02-27 9:28 ` Daniel Borkmann
@ 2014-03-19 23:48 ` tip-bot for Jan Beulich
2014-03-19 23:54 ` tip-bot for Jan Beulich
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Jan Beulich @ 2014-03-19 23:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: ffusco, linux-kernel, hpa, mingo, dborkman, jbeulich, davem,
tgraf, JBeulich, tglx, hpa
Commit-ID: d31abcbca0e076f2a136d214f409b55bf149fade
Gitweb: http://git.kernel.org/tip/d31abcbca0e076f2a136d214f409b55bf149fade
Author: Jan Beulich <JBeulich@suse.com>
AuthorDate: Thu, 27 Feb 2014 08:47:58 +0000
Committer: H. Peter Anvin <hpa@linux.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@suse.com>
Link: http://lkml.kernel.org/r/530F09CE020000780011FBEF@nat28.tlf.novell.com
Cc: Francesco Fusco <ffusco@redhat.com>
Cc: Daniel Borkmann <dborkman@redhat.com>
Cc: Thomas Graf <tgraf@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: H. Peter Anvin <hpa@linux.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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/hash] x86, hash: Simplify switch, add __init annotation
2014-02-27 8:47 [PATCH v2 3/3] x86/hash: cleanup Jan Beulich
2014-02-27 9:28 ` Daniel Borkmann
2014-03-19 23:48 ` [tip:x86/hash] x86, hash: Simplify switch, add __init annotation tip-bot for Jan Beulich
@ 2014-03-19 23:54 ` tip-bot for Jan Beulich
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Jan Beulich @ 2014-03-19 23:54 UTC (permalink / raw)
To: linux-tip-commits
Cc: ffusco, linux-kernel, hpa, mingo, dborkman, jbeulich, davem,
tgraf, JBeulich, tglx, hpa
Commit-ID: 7a5917e9787dd73284f04e35c3cfdb39a67bf0d5
Gitweb: http://git.kernel.org/tip/7a5917e9787dd73284f04e35c3cfdb39a67bf0d5
Author: Jan Beulich <JBeulich@suse.com>
AuthorDate: Thu, 27 Feb 2014 08:47:58 +0000
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Wed, 19 Mar 2014 16:51:04 -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@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>
---
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-19 23:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-27 8:47 [PATCH v2 3/3] x86/hash: cleanup Jan Beulich
2014-02-27 9:28 ` Daniel Borkmann
2014-03-19 23:48 ` [tip:x86/hash] x86, hash: Simplify switch, add __init annotation tip-bot for Jan Beulich
2014-03-19 23:54 ` tip-bot for Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.