From a3301c96e5694c85a0534a63f7b7ee8af63c6aa7 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 12 May 2008 21:20:48 +0200
Subject: [PATCH] --- yaml --- r: 100460 b: refs/heads/master c:
 088b1e427dbba2af93cb6a7d39258c10ff58dd27 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/trace/trace.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b43d7eae7648..154177b8b17c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcb6308f2b56720599f6b9d5a01c33e67e69bde4
+refs/heads/master: 088b1e427dbba2af93cb6a7d39258c10ff58dd27
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 70f94fa92c10..c56fc5e60133 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -770,11 +770,6 @@ trace_entry_idx(struct trace_array *tr, struct trace_array_cpu *data,
 
 	array = page_address(page);
 
-	/* Still possible to catch up to the tail */
-	if (iter->next_idx[cpu] && array == data->trace_tail &&
-	    iter->next_page_idx[cpu] == data->trace_tail_idx)
-		return NULL;
-
 	WARN_ON(iter->next_page_idx[cpu] >= ENTRIES_PER_PAGE);
 	return &array[iter->next_page_idx[cpu]];
 }
@@ -1921,7 +1916,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 	struct trace_iterator *iter = filp->private_data;
 	struct trace_array_cpu *data;
 	static cpumask_t mask;
-	struct trace_entry *entry;
 	static int start;
 	unsigned long flags;
 	int read = 0;
@@ -2013,10 +2007,15 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 		cpu_set(cpu, mask);
 	}
 
-	while ((entry = find_next_entry_inc(iter)) != NULL) {
+	while (find_next_entry_inc(iter) != NULL) {
+		int len = iter->seq.len;
+
 		ret = print_trace_line(iter);
-		if (!ret)
+		if (!ret) {
+			/* don't print partial lines */
+			iter->seq.len = len;
 			break;
+		}
 
 		trace_consume(iter);