From 668f9bdd551c87907bc1dea93c384a450aec478b Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 12 May 2008 21:21:01 +0200
Subject: [PATCH] --- yaml --- r: 100531 b: refs/heads/master c:
 4823ed7eadf35e4b57ce581327e21d39585f1f32 h: refs/heads/master i:   100529:
 425206bdb8ec7a0ead67c89aa8dd224387c6e19a   100527:
 7d6a6c49dc568f5976faf3e735ee13c070e83e28 v: v3

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

diff --git a/[refs] b/[refs]
index 677796ca7639..cd6cef112a9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f1dafe50cc4e58a239fd81bd47f87f32042a1ee
+refs/heads/master: 4823ed7eadf35e4b57ce581327e21d39585f1f32
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 32f9106d612c..49e16630628a 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2455,10 +2455,10 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 		cnt = PAGE_SIZE - 1;
 
 	/* reset all but tr, trace, and overruns */
-	iter->pos = -1;
 	memset(&iter->seq, 0,
 	       sizeof(struct trace_iterator) -
 	       offsetof(struct trace_iterator, seq));
+	iter->pos = -1;
 
 	/*
 	 * We need to stop all tracing on all CPUS to read the