summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog7
-rw-r--r--config/config6
2 files changed, 11 insertions, 2 deletions
diff --git a/changelog b/changelog
index 9939741..0fd7402 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.31.12-rt21-2) unstable; urgency=low
+
+ * enable tracing options: FUNCTION_TRACER, SCHED_TRACER, WAKEUP_LATENCY_HIST
+ and MISSED_TIMER_OFFSETS_HIST, as requested by Carsten Emde.
+
+ -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Sat, 20 Nov 2010 17:05:49 +0100
+
linux-2.6 (2.6.31.12-rt21-1) unstable; urgency=low
* New upstream version
diff --git a/config/config b/config/config
index 538e692..8575ce4 100644
--- a/config/config
+++ b/config/config
@@ -2824,11 +2824,13 @@ CONFIG_HIGH_RES_TIMERS=y
##
## file: kernel/trace/Kconfig
##
-# 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
+CONFIG_SCHED_TRACER=y
+CONFIG_WAKEUP_LATENCY_HIST=y
# CONFIG_CONTEXT_SWITCH_TRACER is not set
+CONFIG_MISSED_TIMER_OFFSETS_HIST=y
# CONFIG_EVENT_TRACER is not set
# CONFIG_FTRACE_SYSCALLS is not set
CONFIG_BOOT_TRACER=y