From a51448b298c0b213e23cbcb51af479b44442c473 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 15 Jan 2009 23:40:11 -0500
Subject: [PATCH] --- yaml --- r: 140642 b: refs/heads/master c:
 745b1626dd71ce9661a05ea4db57859ed5c773d2 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/kernel/trace/trace.c              | 2 +-
 trunk/kernel/trace/trace_irqsoff.c      | 1 +
 trunk/kernel/trace/trace_sched_wakeup.c | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7ed5764928ab..3d15c33289e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a225cdd263f340c864febb1992802fb5b08bc328
+refs/heads/master: 745b1626dd71ce9661a05ea4db57859ed5c773d2
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 7de6a94063dd..220c264e3111 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -41,7 +41,7 @@
 
 #define TRACE_BUFFER_FLAGS	(RB_FL_OVERWRITE)
 
-unsigned long __read_mostly	tracing_max_latency = (cycle_t)ULONG_MAX;
+unsigned long __read_mostly	tracing_max_latency;
 unsigned long __read_mostly	tracing_thresh;
 
 /*
diff --git a/trunk/kernel/trace/trace_irqsoff.c b/trunk/kernel/trace/trace_irqsoff.c
index 7c2e326bbc8b..62a78d943534 100644
--- a/trunk/kernel/trace/trace_irqsoff.c
+++ b/trunk/kernel/trace/trace_irqsoff.c
@@ -380,6 +380,7 @@ static void stop_irqsoff_tracer(struct trace_array *tr)
 
 static void __irqsoff_tracer_init(struct trace_array *tr)
 {
+	tracing_max_latency = 0;
 	irqsoff_trace = tr;
 	/* make sure that the tracer is visible */
 	smp_wmb();
diff --git a/trunk/kernel/trace/trace_sched_wakeup.c b/trunk/kernel/trace/trace_sched_wakeup.c
index 43586b689e31..42ae1e77b6b3 100644
--- a/trunk/kernel/trace/trace_sched_wakeup.c
+++ b/trunk/kernel/trace/trace_sched_wakeup.c
@@ -333,6 +333,7 @@ static void stop_wakeup_tracer(struct trace_array *tr)
 
 static int wakeup_tracer_init(struct trace_array *tr)
 {
+	tracing_max_latency = 0;
 	wakeup_trace = tr;
 	start_wakeup_tracer(tr);
 	return 0;