From 2fc9fc05df8400b5f0cb855409a2e0cc8cc11b4d Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 12 May 2008 21:20:58 +0200 Subject: [PATCH] --- yaml --- r: 100514 b: refs/heads/master c: b5685aede3b7b65e72ddc73b951aa1f70798a614 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c873a4bac4b..95fc1a1575a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8487c23765b6e0444ec6b5f1530766d63fe68e35 +refs/heads/master: b5685aede3b7b65e72ddc73b951aa1f70798a614 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index fd4ecc292005..d141fc98f3a8 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2202,6 +2202,8 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, { struct trace_iterator *iter = filp->private_data; struct trace_array_cpu *data; + struct trace_array *tr = iter->tr; + struct tracer *tracer = iter->trace; static cpumask_t mask; static int start; unsigned long flags; @@ -2274,7 +2276,8 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, cnt = PAGE_SIZE - 1; memset(iter, 0, sizeof(*iter)); - iter->tr = &global_trace; + iter->tr = tr; + iter->trace = tracer; iter->pos = -1; /*