diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 13:35:56 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 13:35:56 +0300 |
commit | 8f63e9230decb06ea9068feaf0845c0eb39ab890 (patch) | |
tree | a45cee821404ab0c7f7164e20c2f40f5e34ac16b /lib/test_printf.c | |
parent | 58ec5e9c9044bd7e1c0bcc6ad822b2e909f49732 (diff) | |
parent | 1268ed0c474a5c8f165ef386f3310521b5e00e27 (diff) | |
download | linux-8f63e9230decb06ea9068feaf0845c0eb39ab890.tar.xz |
Merge branch 'x86/urgent' into x86/hyperv
Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'lib/test_printf.c')
-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"); |