From: "George Spelvin" <linux@horizon.com>
To: davem@davemloft.net, dborkman@redhat.com, linux@horizon.com,
shemminger@osdl.org, tytso@mit.edu
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] lib/random32.c: Remove redundant U suffixes on integers
Date: 7 Jun 2014 04:31:21 -0400 [thread overview]
Message-ID: <20140607083121.10274.qmail@ns.horizon.com> (raw)
In-Reply-To: <20140607081828.9294.qmail@ns.horizon.com>
Get rid of a few of the extraneous U suffixes on ordinary integers.
Signed-off-by: George Spelvin <linux@horizon.com>
---
lib/random32.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/random32.c b/lib/random32.c
index 9cc410dd..ad0c2ed1 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -58,10 +58,10 @@ u32 prandom_u32_state(struct rnd_state *state)
{
#define TAUSWORTHE(s,a,b,c,d) ((s&c)<<d) ^ (((s <<a) ^ s)>>b)
- state->s1 = TAUSWORTHE(state->s1, 6U, 13U, 4294967294U, 18U);
- state->s2 = TAUSWORTHE(state->s2, 2U, 27U, 4294967288U, 2U);
- state->s3 = TAUSWORTHE(state->s3, 13U, 21U, 4294967280U, 7U);
- state->s4 = TAUSWORTHE(state->s4, 3U, 12U, 4294967168U, 13U);
+ state->s1 = TAUSWORTHE(state->s1, 6, 13, 4294967294U, 18);
+ state->s2 = TAUSWORTHE(state->s2, 2, 27, 4294967288U, 2);
+ state->s3 = TAUSWORTHE(state->s3, 13, 21, 4294967280U, 7);
+ state->s4 = TAUSWORTHE(state->s4, 3, 12, 4294967168U, 13);
return (state->s1 ^ state->s2 ^ state->s3 ^ state->s4);
}
@@ -77,9 +77,8 @@ EXPORT_SYMBOL(prandom_u32_state);
u32 prandom_u32(void)
{
struct rnd_state *state = &get_cpu_var(net_rand_state);
- u32 res;
+ u32 res = prandom_u32_state(state);
- res = prandom_u32_state(state);
put_cpu_var(state);
return res;
--
2.0.0
next prev parent reply other threads:[~2014-06-07 8:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-07 8:18 [PATCH 0/7] random32: Various minor cleanups George Spelvin
2014-06-07 8:19 ` [PATCH 1/7] lib/random32.c: Mark self-test data as __initconst George Spelvin
2014-06-08 12:06 ` Daniel Borkmann
2014-06-07 8:20 ` [PATCH 2/7] lib/random32.c: Remove excess calls to prandom_u32_state in initialization George Spelvin
2014-06-08 12:11 ` Daniel Borkmann
2014-06-08 12:19 ` George Spelvin
2014-06-07 8:22 ` [PATCH 3/7] lib/random32.c: Replace an #ifdef with a stub prandom_state_selftest() George Spelvin
2014-06-08 12:16 ` Daniel Borkmann
2014-06-08 12:27 ` George Spelvin
2014-06-07 8:25 ` [PATCH 4/7] lib/random32.c: Use <asm/unaligned.h> instead of hand-rolling it George Spelvin
2014-06-08 12:25 ` Daniel Borkmann
2014-06-08 12:40 ` George Spelvin
2014-06-08 20:26 ` Hannes Frederic Sowa
2014-06-10 15:13 ` Daniel Borkmann
2014-06-07 8:28 ` [PATCH 5/7] lib/random32.c: Make prandom_u32_max efficient for powers of 2 George Spelvin
2014-06-08 12:03 ` Daniel Borkmann
2014-06-08 17:34 ` Hannes Frederic Sowa
2014-06-08 20:02 ` Daniel Borkmann
2014-06-09 0:28 ` George Spelvin
2014-06-08 20:48 ` George Spelvin
2014-06-09 10:30 ` Hannes Frederic Sowa
2014-06-07 8:28 ` [PATCH 6/7] lib/random32.c: Randomize timeout to the millisecond, not the second George Spelvin
2014-06-08 10:43 ` Daniel Borkmann
2014-06-08 11:30 ` George Spelvin
2014-06-08 12:28 ` Daniel Borkmann
2014-06-08 12:42 ` George Spelvin
2014-06-08 20:01 ` Daniel Borkmann
2014-06-07 8:31 ` George Spelvin [this message]
2014-06-08 10:36 ` [PATCH 7/7] lib/random32.c: Remove redundant U suffixes on integers Daniel Borkmann
2014-06-08 11:14 ` George Spelvin
2014-06-08 12:05 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140607083121.10274.qmail@ns.horizon.com \
--to=linux@horizon.com \
--cc=davem@davemloft.net \
--cc=dborkman@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=shemminger@osdl.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®