---

yaml --- r: 123479 b: refs/heads/master c: e2ac8ef h: refs/heads/master i: 123477: e9a0768 123475: c51aa49 123471: 26a300d v: v3
git-mirror · Dec 10, 2008 · 95a71cd · 95a71cd
1 parent 24df784
commit 95a71cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68814b58c52077da9561b544089fe532a0842f71
+refs/heads/master: e2ac8ef576e45d9db7264abc51383e68d26067bb
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -914,7 +914,7 @@ enum trace_file_type {
 	TRACE_FILE_LAT_FMT	= 1,
 };
 
-static void trace_iterator_increment(struct trace_iterator *iter, int cpu)
+static void trace_iterator_increment(struct trace_iterator *iter)
 {
 	/* Don't allow ftrace to trace into the ring buffers */
 	ftrace_disable_cpu();
@@ -993,7 +993,7 @@ static void *find_next_entry_inc(struct trace_iterator *iter)
 	iter->ent = __find_next_entry(iter, &iter->cpu, &iter->ts);
 
 	if (iter->ent)
-		trace_iterator_increment(iter, iter->cpu);
+		trace_iterator_increment(iter);
 
 	return iter->ent ? iter : NULL;
 }