aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordann frazier <dannf@debian.org>2010-01-28 23:21:54 +0000
committerdann frazier <dannf@debian.org>2010-01-28 23:21:54 +0000
commitedab891462b1d11643283ba0594f18f9fb21ee86 (patch)
treecac1304468a7753117251cfc971f52e098d54c75
parenta4efe934e04f4893fdcdc648230c44249b571f4b (diff)
downloadkernel_replicant_linux-edab891462b1d11643283ba0594f18f9fb21ee86.tar.gz
kernel_replicant_linux-edab891462b1d11643283ba0594f18f9fb21ee86.tar.bz2
kernel_replicant_linux-edab891462b1d11643283ba0594f18f9fb21ee86.zip
Enable FUNCTION_TRACER and STACK_TRACER (Closes: #563847)
svn path=/dists/trunk/linux-2.6/; revision=15059
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/config4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a08578b6810e..a2a168da1221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
[ dann frazier ]
* [vserver] explicitly disable CFS_HARD_LIMITS
+ * Enable FUNCTION_TRACER and STACK_TRACER (Closes: #563847)
-- Ben Hutchings <ben@decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000
diff --git a/debian/config/config b/debian/config/config
index 2b557c71077c..17271fc702fb 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3241,7 +3241,7 @@ CONFIG_HIGH_RES_TIMERS=y
## file: kernel/trace/Kconfig
##
CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SYSPROF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
@@ -3253,7 +3253,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
## end choice
# CONFIG_POWER_TRACER is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
# CONFIG_HW_BRANCH_TRACER is not set
# CONFIG_KMEMTRACE is not set
# CONFIG_WORKQUEUE_TRACER is not set