diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 05:55:12 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 05:55:12 -0400 |
commit | c5f5aeef9b55b362ad5a0e04e4b41cd63b208842 (patch) | |
tree | 0ee2bb561e879db0a990d998359f6516dff3393b /lib/test_printf.c | |
parent | a4789089937941959be6c18fa53e1fc0189257fd (diff) | |
parent | c7513c2a2714204d3588ecaa170ae628fd0d217e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
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) | |||
260 | { | 260 | { |
261 | int err; | 261 | int err; |
262 | 262 | ||
263 | /* | ||
264 | * Make sure crng is ready. Otherwise we get "(ptrval)" instead | ||
265 | * of a hashed address when printing '%p' in plain_hash() and | ||
266 | * plain_format(). | ||
267 | */ | ||
268 | wait_for_random_bytes(); | ||
269 | |||
270 | err = plain_hash(); | 263 | err = plain_hash(); |
271 | if (err) { | 264 | if (err) { |
272 | pr_warn("plain 'p' does not appear to be hashed\n"); | 265 | pr_warn("plain 'p' does not appear to be hashed\n"); |