summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-10-10 12:11:18 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2016-10-10 12:11:18 +1100
commitde530c950510ab38565c427e900369caa7132ce8 (patch)
treef549062a67c03b05c3e4223ee9f6b18c65dba280 /drivers
parent66a3cfa5db2445951c670cb89ebeeeb9928bed0f (diff)
parent09dd109d8241cd570391d4488337b77a4525f24e (diff)
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/random.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 3efb3bf0ab83..7274ae89ddb3 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -479,8 +479,8 @@ static ssize_t _extract_entropy(struct entropy_store *r, void *buf,
static void crng_reseed(struct crng_state *crng, struct entropy_store *r);
static void push_to_pool(struct work_struct *work);
-static __u32 input_pool_data[INPUT_POOL_WORDS];
-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
static struct entropy_store input_pool = {
.poolinfo = &poolinfo_table[0],