---

yaml --- r: 100514 b: refs/heads/master c: b5685ae h: refs/heads/master v: v3
git-mirror · May 23, 2008 · 2fc9fc0 · 2fc9fc0
1 parent 59d561b
commit 2fc9fc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 
 	/*