Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 140770
b: refs/heads/master
c: fa7c7f6
h: refs/heads/master
v: v3
  • Loading branch information
Frederic Weisbecker authored and Ingo Molnar committed Feb 18, 2009
1 parent 9a79fdb commit e9556b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6eaaa5d57e76c454479833fc8594cd7c3b75c789
refs/heads/master: fa7c7f6e11f70d62505074a8b30a776236850dec
5 changes: 2 additions & 3 deletions trunk/kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2571,8 +2571,7 @@ static struct pipe_buf_operations tracing_pipe_buf_ops = {
};

static size_t
tracing_fill_pipe_page(struct page *pages, size_t rem,
struct trace_iterator *iter)
tracing_fill_pipe_page(size_t rem, struct trace_iterator *iter)
{
size_t count;
int ret;
Expand Down Expand Up @@ -2649,7 +2648,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
if (!pages[i])
break;

rem = tracing_fill_pipe_page(pages[i], rem, iter);
rem = tracing_fill_pipe_page(rem, iter);

/* Copy the data into the page, so we can start over. */
ret = trace_seq_to_buffer(&iter->seq,
Expand Down

0 comments on commit e9556b9

Please sign in to comment.