diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-28 12:45:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-28 12:45:34 -0700 |
commit | 90368a37fbbe76056db2b703c08903939a2a18dc (patch) | |
tree | 19d2b8697bdfeb8644eb7c874a93b8a249876f0b | |
parent | e26aac3caeadc476b96a1f384715e96b4a607342 (diff) | |
parent | 043f891b70e6197bc181f3b087c2bd04c60fddd2 (diff) | |
download | linux-stable-90368a37fbbe76056db2b703c08903939a2a18dc.tar.gz linux-stable-90368a37fbbe76056db2b703c08903939a2a18dc.tar.bz2 linux-stable-90368a37fbbe76056db2b703c08903939a2a18dc.zip |
Merge tag 'printk-for-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk fix from Petr Mladek:
"Revert a commit that went in by mistake. I already have a better fix
in the queue for 4.19"
* tag 'printk-for-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
Revert "lib/test_printf.c: call wait_for_random_bytes() before plain %p tests"
-rw-r--r-- | lib/test_printf.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/test_printf.c b/lib/test_printf.c index b2aa8f514844..cea592f402ed 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -260,13 +260,6 @@ plain(void) { int err; - /* - * Make sure crng is ready. Otherwise we get "(ptrval)" instead - * of a hashed address when printing '%p' in plain_hash() and - * plain_format(). - */ - wait_for_random_bytes(); - err = plain_hash(); if (err) { pr_warn("plain 'p' does not appear to be hashed\n"); |