Skip to content

Commit 09a6b0b

Browse files
tsautereau-anssitorvalds
authored andcommitted
random32: Restore __latent_entropy attribute on net_rand_state
Commit f227e3e ("random32: update the net random state on interrupt and activity") broke compilation and was temporarily fixed by Linus in 83bdc72 ("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: 83bdc72 ("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>
1 parent be45831 commit 09a6b0b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

lib/random32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static inline void prandom_state_selftest(void)
4949
}
5050
#endif
5151

52-
DEFINE_PER_CPU(struct rnd_state, net_rand_state);
52+
DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
5353

5454
/**
5555
* prandom_u32_state - seeded pseudo-random number generator.

0 commit comments

Comments
 (0)