From 9a2b551f52dd320ea768f08791690430367fabe4 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Wed, 25 Jul 2012 11:39:08 -0400
Subject: [PATCH] --- yaml --- r: 346895 b: refs/heads/master c:
 bf3071f5a054db9e5bab873355d27a7330ce5187 h: refs/heads/master i:   346893:
 2bcabcc53dffe93163b11869fc18ddd60db8c85f   346891:
 d43c9841300448da7a7239c78de72d394e24dc76   346887:
 0bfa75e1445a90c65ca46ca2a9b76d49569df1bc   346879:
 ecedc3942fbe01d459dae66aa7ea1a03021ea154 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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;