[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20131112155549.c160273993147244ed6bc81d@canb.auug.org.au>
Date: Tue, 12 Nov 2013 15:55:49 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Theodore Ts'o" <tytso@....edu>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Hannes Frederic Sowa <hannes@...essinduktion.org>,
David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
Daniel Borkmann <dborkman@...hat.com>
Subject: linux-next: manual merge of the random tree with the net-next tree
Hi Ted,
Today's linux-next merge of the random tree got a conflict in
drivers/char/random.c between commit 0244ad004a54 ("random32: add
prandom_reseed_late() and call when nonblocking pool becomes
initialized") from the net-next tree and commit 301f0595c0e7 ("random:
printk notifications for urandom pool initialization") from the random
tree.
I fixed it up (probably not properly - see below) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/char/random.c
index 4fe5609eeb72,cdf4cfb2da4d..000000000000
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -255,8 -255,12 +255,9 @@@
#include <linux/fips.h>
#include <linux/ptrace.h>
#include <linux/kmemcheck.h>
+#include <linux/irq.h>
+ #include <linux/workqueue.h>
-#ifdef CONFIG_GENERIC_HARDIRQS
-# include <linux/irq.h>
-#endif
-
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
@@@ -601,12 -654,14 +651,16 @@@ retry
if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
goto retry;
+ r->entropy_total += nbits;
if (!r->initialized && nbits > 0) {
- r->entropy_total += nbits;
if (r->entropy_total > 128) {
+ if (r == &nonblocking_pool)
+ pr_notice("random: %s pool is initialized\n",
+ r->name);
r->initialized = 1;
+ if (r == &nonblocking_pool)
+ prandom_reseed_late();
+ r->entropy_total = 0;
}
}
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists