diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-01-08 14:27:34 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-01-08 14:27:34 +0100 |
| commit | d2852b932f0bb5e89177aa27c7bcf07f4167e129 (patch) | |
| tree | 96d975ae155ba307acd07968939fff22afedddf7 /kernel/trace/trace.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 14f0ca8eaea42a5b5a69cfcb699665dd2618db5f (diff) | |
Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index d86e3252f300..a96b335fe75c 100644 --- a/kernel/trace/trace.c +++ b/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; } |