diff options
author | David S. Miller <davem@davemloft.net> | 2013-11-11 23:33:06 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-11 23:33:06 +0400 |
commit | 75ecab1df14d90e86cebef9ec5c76befde46e65f (patch) | |
tree | aa0aee61cf99280eaa533956438c9daec3a2afc7 /init/main.c | |
parent | 129596674c00352cbbb1efaf36db50726fd374ef (diff) | |
parent | a6a9c0f1bf5a9a5faa605773ea75e0b93c3ab108 (diff) | |
download | linux-75ecab1df14d90e86cebef9ec5c76befde46e65f.tar.xz |
Merge branch 'prandom'
prandom fixes/improvements
====================
It would be great if you could still consider this series that fixes and
improves prandom for 3.13. We have sent it to netdev as prandom() originally
came from net/core/utils.c and networking is its main user. For a detailled
description, please see individual patches.
For patch 3 in this series, there will be a minor merge conflict with the
random tree that is for 3.13. See below how to resolve it.
====
Hannes says: on merge with the random tree I would suggest to resolve the
conflict in drivers/char/random.c like this:
if (r->entropy_total > 128) {
r->initialized = 1;
r->entropy_total = 0;
if (r == &nonblocking_pool) {
prandom_reseed_late();
pr_notice("random: %s pool is initialized\n",
r->name);
}
}
So it won't generate a warning if DEBUG_RANDOM_BOOT gets activated.
====
Patch 1 should probably also go to -stable.
Set tested on 32 and 64 bit machines.
Thanks a lot!
Ref. original discussion: http://patchwork.ozlabs.org/patch/289951/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions