summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>2020-10-02 18:16:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-02 19:31:54 +0300
commit09a6b0bc3be793ca8cba580b7992d73e9f68f15d (patch)
tree8a3260a38e0c6a91877ba7f83db373afc44380dc /lib
parentbe458311cdbb5d94820ffc4e40c5906085c0a507 (diff)
downloadlinux-09a6b0bc3be793ca8cba580b7992d73e9f68f15d.tar.xz
random32: Restore __latent_entropy attribute on net_rand_state
Commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity") broke compilation and was temporarily fixed by Linus in 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin") by entirely moving net_rand_state out of the things handled by the latent_entropy GCC plugin. From what I understand when reading the plugin code, using the __latent_entropy attribute on a declaration was the wrong part and simply keeping the __latent_entropy attribute on the variable definition was the correct fix. Fixes: 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin") Acked-by: Willy Tarreau <w@1wt.eu> Cc: Emese Revfy <re.emese@gmail.com> Signed-off-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/random32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/random32.c b/lib/random32.c
index 932345323af0..dfb9981ab798 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -49,7 +49,7 @@ static inline void prandom_state_selftest(void)
}
#endif
-DEFINE_PER_CPU(struct rnd_state, net_rand_state);
+DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
/**
* prandom_u32_state - seeded pseudo-random number generator.