diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-07-31 12:58:05 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-07-31 13:16:09 +0300 |
commit | 28cff52eaeb5c43144d0c730080aff0d6bc1e5d5 (patch) | |
tree | a55a41b99503a5c96314908b9f30db37e301d64d /include/linux/random.h | |
parent | 92c209ac6d3d35783c16c8a717547183e6e11162 (diff) | |
parent | d8b9faec54ae4bc2fff68bcd0befa93ace8256ce (diff) | |
download | linux-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.tar.xz |
Merge branch 'linus' into locking/core, to resolve conflict
Conflicts:
arch/arm/include/asm/percpu.h
As Stephen Rothwell noted, there's a conflict between this commit
in locking/core:
a21ee6055c30 ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables")
and this fresh upstream commit:
aa54ea903abb ("ARM: percpu.h: fix build error")
a21ee6055c30 is a simpler solution to the dependency problem and doesn't
further increase header hell - so this conflict resolution effectively
reverts aa54ea903abb and uses the a21ee6055c30 solution.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/random.h')
-rw-r--r-- | include/linux/random.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/random.h b/include/linux/random.h index 45e1f8fa742b..9ab7443bd91b 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/once.h> +#include <asm/percpu.h> #include <uapi/linux/random.h> @@ -119,6 +120,8 @@ struct rnd_state { __u32 s1, s2, s3, s4; }; +DECLARE_PER_CPU(struct rnd_state, net_rand_state); + u32 prandom_u32_state(struct rnd_state *state); void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes); void prandom_seed_full_state(struct rnd_state __percpu *pcpu_state); |