From 95a71cdd59cae6151c79c56b8682bbe08975e11e Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 12 Nov 2008 12:59:32 +0100 Subject: [PATCH] --- yaml --- r: 123479 b: refs/heads/master c: e2ac8ef576e45d9db7264abc51383e68d26067bb h: refs/heads/master i: 123477: e9a076843eb41b00269d5427796e17f82eb1a9f3 123475: c51aa496aa55211e03eff66ac1dc184062e95cab 123471: 26a300d5ab0b7253b9245fc19a6c655fa3136f13 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c240f4d40e8a..d354b7741ce7 100644 --- 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 index d86e3252f300..a96b335fe75c 100644 --- 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; }