diff options
| author | Andrey Ryabinin <aryabinin@virtuozzo.com> | 2017-03-22 11:32:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-22 11:32:20 +0000 |
| commit | 3c2c3fce0d6f675afee580f5ca974066c2e735c2 (patch) | |
| tree | 5b6002dd64b5b4c766a9979ab0dd2b6076245afa | |
| parent | 2bc9e957b28fd37939e79396ed784ed7c505da0d (diff) | |
| parent | 8e0ec20539f8c626463ae43fcaeb218e3b2b5dc4 (diff) | |
x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
am: 8e0ec20539
Change-Id: I232544f0d96384f70c58b37f41f524ff4bc808fe
| -rw-r--r-- | arch/x86/kernel/head64.c | 1 | ||||
| -rw-r--r-- | arch/x86/mm/kasan_init_64.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index f129a9af6357..b6b0077da1af 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -4,6 +4,7 @@ * Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE */ +#define DISABLE_BRANCH_PROFILING #include <linux/init.h> #include <linux/linkage.h> #include <linux/types.h> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index d470cf219a2d..4e5ac46adc9d 100644 --- 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> |