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

[Dann Frazier]

Author: dannf
Date: Mon Feb  1 23:42:40 2010
New Revision: 15095

Log:
Disable FUNCTION_TRACER due to performance/build issues.

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	Mon Feb  1 23:40:51 2010	(r15094)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Feb  1 23:42:40 2010	(r15095)
@@ -8,6 +8,9 @@
   * clocksource/events: Fix fallout of generic code changes
     (Closes: #568030)
 
+  [ dann frazier ]
+  * Disable FUNCTION_TRACER due to performance/build issues.
+
  -- maximilian attems <maks at debian.org>  Mon, 01 Feb 2010 17:16:31 +0100
 
 linux-2.6 (2.6.32-6) unstable; urgency=high

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Feb  1 23:40:51 2010	(r15094)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Feb  1 23:42:40 2010	(r15095)
@@ -3241,7 +3241,7 @@
 ## file: kernel/trace/Kconfig
 ##
 CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set