summaryrefslogtreecommitdiffstats
path: root/kernel/arch
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2017-02-08 17:12:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 17:12:08 +0000
commit881aa3fcf152088440444d6f4296eaac3783801c (patch)
tree64c31cd83328bda712ba119ecf29b8b1ef9743a9 /kernel/arch
parent2046178d894438b492d93f30941076ee7964f6ab (diff)
parente1a58e17cf85b14c61c2389588ed7bf5da88fd53 (diff)
Merge "Enable the MCE_INJECT kernel config"
Diffstat (limited to 'kernel/arch')
-rw-r--r--kernel/arch/x86/configs/opnfv.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config
index 95bb41d70..ad950c760 100644
--- 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