Merge 4.14.75 into android-4.14-p

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / crypto / xor.c

diff --git a/crypto/xor.c b/crypto/xor.c
index 263af9fb45ea281c94c41d5698d4d264d489bba9..bce9fe7af40ad44a68056d35d7d2e377bd3966f1 100644 (file)
--- 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;