1 files changed, 3 insertions, 4 deletions

diff --git a/lib/random32.c b/lib/random32.c
index 510d1ce7d4d2..fa594b1140e6 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
 }
 #endif
 
-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
 
 /**
  *      prandom_u32_state - seeded pseudo-random number generator.
@@ -81,7 +81,7 @@ u32 prandom_u32(void)
         u32 res;
 
         res = prandom_u32_state(state);
-        put_cpu_var(state);
+        put_cpu_var(net_rand_state);
 
         return res;
 }
@@ -128,7 +128,7 @@ void prandom_bytes(void *buf, size_t bytes)
         struct rnd_state *state = &get_cpu_var(net_rand_state);
 
         prandom_bytes_state(state, buf, bytes);
-        put_cpu_var(state);
+        put_cpu_var(net_rand_state);
 }
 EXPORT_SYMBOL(prandom_bytes);
 
@@ -233,7 +233,6 @@ static void __prandom_timer(unsigned long dontcare)
 
 static void __init __prandom_start_seed_timer(void)
 {
-        set_timer_slack(&seed_timer, HZ);
         seed_timer.expires = jiffies + msecs_to_jiffies(40 * MSEC_PER_SEC);
         add_timer(&seed_timer);
 }