[PATCH 3/8] drivers/char/random: make get_random_int_hash a structure

[George Spelvin]

We'll need to add some fields to it in later work.
---
 drivers/char/random.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index fdbf7b6..113508e 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1624,7 +1624,10 @@ EXPORT_SYMBOL(secure_dccp_sequence_number);
  * value is not strongly cryptographically secure, but for several uses the
  * cost of depleting entropy is too high.
  */
-DEFINE_PER_CPU(__u32 [4], get_random_int_hash);
+struct cpu_random {
+	u32 hash[4];
+};
+DEFINE_PER_CPU(struct cpu_random, get_random_int_data);
 static u32 __get_random_int(u32 *hash)
 {
 	struct keydata const *keyptr = get_keyptr();
@@ -1640,10 +1643,10 @@ static u32 __get_random_int(u32 *hash)
 
 unsigned int get_random_int(void)
 {
-	u32 *hash = get_cpu_var(get_random_int_hash);
-	u32 ret = __get_random_int(hash);
+	struct cpu_random *r = &get_cpu_var(get_random_int_data);
+	u32 ret = __get_random_int(r->hash);
 
-	put_cpu_var(get_random_int_hash);
+	put_cpu_var(r);
 	return ret;
 }
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/