diff options
author | James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
commit | 4a06f454768a7e11e8f10b900b450786546cbba1 (patch) | |
tree | 149f57c9ce794734883e326d63040b1381dc1a59 /crypto/xor.c | |
parent | fe6ec4634c4b41ea65f055ea709a6f3d5bf67bec (diff) | |
parent | 8dce1988dfaa3668372990f05ee2202d9d9521b5 (diff) | |
download | linux-crypto-4a06f454768a7e11e8f10b900b450786546cbba1.tar.gz linux-crypto-4a06f454768a7e11e8f10b900b450786546cbba1.zip |
Sync to v4.15-rc3 for security subsystem developers to work against.
Diffstat (limited to '')
-rw-r--r-- | crypto/xor.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/xor.c b/crypto/xor.c index 263af9fb..bce9fe7a 100644 --- a/crypto/xor.c +++ b/crypto/xor.c @@ -122,12 +122,7 @@ calibrate_xor_blocks(void) goto out; } - /* - * Note: Since the memory is not actually used for _anything_ but to - * test the XOR speed, we don't really want kmemcheck to warn about - * reading uninitialized bytes here. - */ - b1 = (void *) __get_free_pages(GFP_KERNEL | __GFP_NOTRACK, 2); + b1 = (void *) __get_free_pages(GFP_KERNEL, 2); if (!b1) { printk(KERN_WARNING "xor: Yikes! No memory available.\n"); return -ENOMEM; |