From 65a74ff7b3f0b2bd71a48b979b36fa4cccf52fd0 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 15 Jan 2009 23:40:11 -0500 Subject: [PATCH] --- yaml --- r: 130593 b: refs/heads/master c: 1092307d582a7566d23779c304cf86f3075ac5f0 h: refs/heads/master i: 130591: 4340a7a55a2d39fdc88bfda80a8f3454591a5ca6 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 3bb1d4b46e04..14f2f4c6b14e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a442e5e0a2011af5b2d1f118fee0a8f9079f1d88 +refs/heads/master: 1092307d582a7566d23779c304cf86f3075ac5f0 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 4d89e84f0f4b..17bb88d86ac2 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -40,7 +40,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;