summaryrefslogtreecommitdiff
path: root/crypto/xor.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-09-08 14:32:24 -0700
committerDan Williams <dan.j.williams@intel.com>2009-09-08 14:32:24 -0700
commit88fd32554ae2782729bd3031d978bfbba0669459 (patch)
tree917cbc551b971cd0637650b95882d97fac9a4b89 /crypto/xor.c
parentc0a16d573d49785fedcacf87328ac5257bcb70c0 (diff)
parente286091b2b21d1ff9166609cd19e0df62b56f4bc (diff)
downloadlinux-crypto-88fd32554ae2782729bd3031d978bfbba0669459.tar.gz
linux-crypto-88fd32554ae2782729bd3031d978bfbba0669459.zip
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'crypto/xor.c')
-rw-r--r--crypto/xor.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/xor.c b/crypto/xor.c
index 996b6ee5..fc5b836f 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -101,7 +101,12 @@ calibrate_xor_blocks(void)
void *b1, *b2;
struct xor_block_template *f, *fastest;
- b1 = (void *) __get_free_pages(GFP_KERNEL, 2);
+ /*
+ * 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);
if (!b1) {
printk(KERN_WARNING "xor: Yikes! No memory available.\n");
return -ENOMEM;