Merge tag 'v4.11-rc5' into x86/mm, to refresh the branch

[sfrench/cifs-2.6.git] / arch / x86 / mm / kasan_init_64.c

diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 7b81f01067f2a9e6164728784848ee9f7068c3d0..3d1059db6bf62ede5691ca8f0c01f1792958925b 100644 (file)
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -1,3 +1,4 @@
+#define DISABLE_BRANCH_PROFILING
 #define pr_fmt(fmt) "kasan: " fmt
 #include <linux/bootmem.h>
 #include <linux/kasan.h>