From 89c5941b8834afbcb916de2e9470bcb388440746 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 23 Feb 2018 18:33:21 +0000 Subject: [PATCH] kernel: Adjust kernel config files for 4.14 - KMEMCHECK has been removed - PROFILE_ALL_BRANCHES was added (but is disabled) Signed-off-by: Rolf Neugebauer --- kernel/config-4.14.x-aarch64 | 1 - kernel/config-4.14.x-x86_64 | 2 -- 2 files changed, 3 deletions(-) diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index db98836e5..4b4e3069f 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -3957,7 +3957,6 @@ CONFIG_FTRACE_SYSCALLS=y # CONFIG_TRACER_SNAPSHOT is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 6e78232e5..a31f0a365 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -3646,7 +3646,6 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y @@ -3747,7 +3746,6 @@ CONFIG_FTRACE_SYSCALLS=y # CONFIG_TRACER_SNAPSHOT is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y