From 0cb9f0e806711f3801766f29434ad44c6358eb19 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 22 Mar 2009 23:10:47 +0100
Subject: [PATCH] --- yaml --- r: 141015 b: refs/heads/master c:
 7e6ea92df3fd7cbe74e7985c6f3e40255c44b201 h: refs/heads/master i:   141013:
 1012dbc10eb723a3a3b429893ba79c0d2599a945   141011:
 719076d51d03d732ad57a17672de5cf1845c4c7b   141007:
 729f94213e5355ed80546bf992636eab0578ddc4 v: v3

---
 [refs]                         | 2 +-
 trunk/kernel/trace/trace_nop.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86855f09014a..82c9f71ee72a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07edf7121374609709ef1b0889f6e7b8d6a62ec1
+refs/heads/master: 7e6ea92df3fd7cbe74e7985c6f3e40255c44b201
diff --git a/trunk/kernel/trace/trace_nop.c b/trunk/kernel/trace/trace_nop.c
index 9aa84bde23cd..394f94417e2f 100644
--- a/trunk/kernel/trace/trace_nop.c
+++ b/trunk/kernel/trace/trace_nop.c
@@ -91,6 +91,7 @@ struct tracer nop_trace __read_mostly =
 	.name		= "nop",
 	.init		= nop_trace_init,
 	.reset		= nop_trace_reset,
+	.wait_pipe	= poll_wait_pipe,
 #ifdef CONFIG_FTRACE_SELFTEST
 	.selftest	= trace_selftest_startup_nop,
 #endif