diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-09-29 11:39:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-09-29 11:39:31 +1000 |
| commit | 4d8759d644731cd0bc5c52352498c2bca2d928e3 (patch) | |
| tree | cea3e8a08d8a851546e972bdbfeffa7668af1678 /lib | |
| parent | 657d91dac15f0e758ce5a78608c70c68f5a836a9 (diff) | |
| parent | 09dd109d8241cd570391d4488337b77a4525f24e (diff) | |
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/irq_poll.c | 2 | ||||
| -rw-r--r-- | lib/random32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/irq_poll.c b/lib/irq_poll.c index 836f7db4e548..63be7495dbb2 100644 --- a/lib/irq_poll.c +++ b/lib/irq_poll.c @@ -74,7 +74,7 @@ void irq_poll_complete(struct irq_poll *iop) } EXPORT_SYMBOL(irq_poll_complete); -static void irq_poll_softirq(struct softirq_action *h) +static void __latent_entropy irq_poll_softirq(struct softirq_action *h) { struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll); int rearm = 0, budget = irq_poll_budget; diff --git a/lib/random32.c b/lib/random32.c index 915982b304bb..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. |