diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
| commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
| tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/trace/trace.c | |
| parent | ae1f30384baef4056438d81b305a6a5199b0d16c (diff) | |
| parent | ac91d85456372a90af5b85eb6620fd2efb1e431b (diff) | |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 032c57ca6502..5edf410bc540 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -1703,6 +1703,7 @@ static void *s_start(struct seq_file *m, loff_t *pos) | |||
| 1703 | 1703 | ||
| 1704 | ftrace_enable_cpu(); | 1704 | ftrace_enable_cpu(); |
| 1705 | 1705 | ||
| 1706 | iter->leftover = 0; | ||
| 1706 | for (p = iter; p && l < *pos; p = s_next(m, p, &l)) | 1707 | for (p = iter; p && l < *pos; p = s_next(m, p, &l)) |
| 1707 | ; | 1708 | ; |
| 1708 | 1709 | ||