[kernel] r15059 - in dists/trunk/linux-2.6/debian: . config

[Dann Frazier]

Author: dannf
Date: Thu Jan 28 23:21:54 2010
New Revision: 15059

Log:
Enable FUNCTION_TRACER and STACK_TRACER (Closes: #563847)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jan 28 22:53:45 2010	(r15058)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jan 28 23:21:54 2010	(r15059)
@@ -74,6 +74,7 @@
 
   [ dann frazier ]
   * [vserver] explicitly disable CFS_HARD_LIMITS
+  * Enable FUNCTION_TRACER and STACK_TRACER (Closes: #563847)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Jan 28 22:53:45 2010	(r15058)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Jan 28 23:21:54 2010	(r15059)
@@ -3241,7 +3241,7 @@
 ## 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_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