Merge branch 'core/urgent' into core/futexes

Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
              to get the latest upstream fixes.

Conflicts:
	kernel/futex.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 5 deletions

diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c
index b9767acd30ac..394f94417e2f 100644
--- a/kernel/trace/trace_nop.c
+++ b/kernel/trace/trace_nop.c
@@ -47,12 +47,7 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static int nop_trace_init(struct trace_array *tr)
 {
-        int cpu;
         ctx_trace = tr;
-
-        for_each_online_cpu(cpu)
-                tracing_reset(tr, cpu);
-
         start_nop_trace(tr);
         return 0;
 }
@@ -96,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