X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=crypto%2Fxor.c;h=b75182d8ab1460b141619cc63af15d03fe6b2475;hb=4843456c5c341eb57f80f9224362a22665d14107;hp=b2e6db075e4993eac4fcffb9004b82ee4a0bca71;hpb=c2dc1ad582196208a2f990eb0230eb922046c684;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/crypto/xor.c b/crypto/xor.c
index b2e6db075e49..b75182d8ab14 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -18,8 +18,9 @@
 
 #define BH_TRACE 0
 #include <linux/module.h>
-#include <linux/raid/md.h>
+#include <linux/gfp.h>
 #include <linux/raid/xor.h>
+#include <linux/jiffies.h>
 #include <asm/xor.h>
 
 /* The xor routines to use.  */
@@ -101,7 +102,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;