Merge tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.git] / lib / random32.c

diff --git a/lib/random32.c b/lib/random32.c
index 69ed593aab07315d90c4b2dc2e2fcbb9931211fd..fa594b1140e648899410d15920ea5705d7202661 100644 (file)
--- 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);