From: Jiang, Yunhong <yunhong.jiang@intel.com>
Date: Thu, 16 Feb 2017 18:00:47 +0000 (+0000)
Subject: Merge "Enabling ftrace for kernel debugging."
X-Git-Tag: danube.1.0~16
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=48f1b1f5298bc4960f261df412315d6e15897c43;hp=be208cb48be4f4db438ce27be15e1f6166c26910

Merge "Enabling ftrace for kernel debugging."
---

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