Commit 90368a37 authored by Linus Torvalds's avatar Linus Torvalds

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"
parents e26aac3c 043f891b
...@@ -260,13 +260,6 @@ plain(void) ...@@ -260,13 +260,6 @@ plain(void)
{ {
int err; 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(); err = plain_hash();
if (err) { if (err) {
pr_warn("plain 'p' does not appear to be hashed\n"); pr_warn("plain 'p' does not appear to be hashed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment