From: Yunhong Jiang Date: Sat, 4 Feb 2017 02:47:46 +0000 (-0800) Subject: Enable the MCE_INJECT kernel config X-Git-Tag: danube.1.0~17^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=e1a58e17cf85b14c61c2389588ed7bf5da88fd53 Enable the MCE_INJECT kernel config The barometer need the mce_inject for testing. Enable it on the kernel. Upstream status: N/A Change-Id: I0dd94984198b1d1c49a051cd5e70d62087aa81f1 Signed-off-by: Yunhong Jiang --- 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