Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346895
b: refs/heads/master
c: bf3071f
h: refs/heads/master
i:
  346893: 2bcabcc
  346891: d43c984
  346887: 0bfa75e
  346879: ecedc39
v: v3
  • Loading branch information
Dave Jones authored and Steven Rostedt committed Nov 19, 2012
1 parent d99431e commit 9a2b551
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 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: 717a9ef7f355480686cdbac3f32d6075437a923e
refs/heads/master: bf3071f5a054db9e5bab873355d27a7330ce5187
2 changes: 0 additions & 2 deletions trunk/kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -4275,13 +4275,11 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
return -ENOMEM;

if (*ppos & (PAGE_SIZE - 1)) {
WARN_ONCE(1, "Ftrace: previous read must page-align\n");
ret = -EINVAL;
goto out;
}

if (len & (PAGE_SIZE - 1)) {
WARN_ONCE(1, "Ftrace: splice_read should page-align\n");
if (len < PAGE_SIZE) {
ret = -EINVAL;
goto out;
Expand Down

0 comments on commit 9a2b551

Please sign in to comment.