diff --git a/[refs] b/[refs] index 7ce34e9f2f67..81a60b29c61b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c175eea466e760de4b69b9aad90157e7aa9ff54f +refs/heads/master: 33f65df7ed1abcaac32ba620b9976a4d8cea3248 diff --git a/trunk/crypto/xor.c b/trunk/crypto/xor.c index 996b6ee57d9e..fc5b836f3430 100644 --- a/trunk/crypto/xor.c +++ b/trunk/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;