diff --git a/[refs] b/[refs] index 417ad138839d..5792e2028da9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 717a9ef7f355480686cdbac3f32d6075437a923e +refs/heads/master: bf3071f5a054db9e5bab873355d27a7330ce5187 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 64ad9bc4275b..5bc35907cc6e 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -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;