Code Review / kvmfornfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: be208cb)
Merge "Enabling ftrace for kernel debugging."
authorJiang, Yunhong <yunhong.jiang@intel.com>
Thu, 16 Feb 2017 18:00:47 +0000 (18:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 16 Feb 2017 18:00:47 +0000 (18:00 +0000)
kernel/arch/x86/configs/opnfv.config patch | blob | history

diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config
index 95bb41d..ad950c7 100644 (file)
--- a/kernel/arch/x86/configs/opnfv.config
+++ b/kernel/arch/x86/configs/opnfv.config
@@ -430,7 +430,7 @@ CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INJECT=y
 CONFIG_X86_THERMAL_VECTOR=y
 # CONFIG_VM86 is not set
 CONFIG_X86_16BIT=y
@@ -830,7 +830,7 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_CONNTRACK_MARK is not set
+CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_PROCFS=y