commit 8a60c8aaefe4a4451e7a1dba655a1c95dcb2cb95
author Adinarayana Gupta Grandhi <agrandhi@codeaurora.org> Fri Dec 02 17:31:51 2011 +0530
committer Linux Build Service Account <lnxbuild@localhost> Thu Dec 08 17:07:03 2011 -0700
tree 5191461a26c489cde4b38ce6cf46cd77e51cbaa1
parent 13605e484b85a9f4b1f38f678c090b640bb3c2a7

defconfig:  Fix for watchdog killing powermanagerservice

The deadlock is in-direct result of the log.wtf message coming
with file not found exception on /proc/net/xt_qtaguid/stats and
this can be avoided with enabling the
CONFIG_NETFILTER_XT_MATCH_QTAGUID

CRs-fixed: 322084
Change-Id: I88b13b5d0eba8c7164938f1eebbf4b01eafd6b69
Signed-off-by: Adinarayana Gupta Grandhi <agrandhi@codeaurora.org>
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 3ccab17..83d012c 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -135,6 +135,7 @@
 CONFIG_NF_CONNTRACK_SIP=y
 CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
@@ -151,10 +152,11 @@
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y