diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
| commit | eb703027ac4ed563823e4d7824f68afed637d89a (patch) | |
| tree | de35552440e7d2c7b74d0020c6a3cc1a8ed8b060 /kernel/trace/trace.c | |
| parent | 429e90893c9ad2c266d541c94d6ca69a34a7701d (diff) | |
| parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index fc20e09a6cb1..8f3fb3db61c3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -1183,7 +1183,6 @@ static void *find_next_entry_inc(struct trace_iterator *iter) | |||
| 1183 | static void *s_next(struct seq_file *m, void *v, loff_t *pos) | 1183 | static void *s_next(struct seq_file *m, void *v, loff_t *pos) |
| 1184 | { | 1184 | { |
| 1185 | struct trace_iterator *iter = m->private; | 1185 | struct trace_iterator *iter = m->private; |
| 1186 | void *last_ent = iter->ent; | ||
| 1187 | int i = (int)*pos; | 1186 | int i = (int)*pos; |
| 1188 | void *ent; | 1187 | void *ent; |
| 1189 | 1188 | ||