summaryrefslogtreecommitdiff
path: root/crypto/xor.c
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2018-01-29 15:54:46 +0100
committerJuergen Gross <jgross@suse.com>2018-01-29 15:54:46 +0100
commitfe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch)
tree2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/xor.c
parent40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff)
parent21864b027d847a6d91903a5ba219770403ba8aad (diff)
downloadlinux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz
linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to '')
-rw-r--r--crypto/xor.c7
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;