From 4b36b89c641dba84dc6998a2fd36c7afad893eaa Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 23 May 2011 15:27:46 -0400 Subject: [PATCH] --- yaml --- r: 252656 b: refs/heads/master c: 17bb615ad4f8d2d2c0f02794d27d7f83e0009ef4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0309bbe4373e..948d879daac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1cd6173596c6f7d1f0b41ac7d33ecf03c581edc +refs/heads/master: 17bb615ad4f8d2d2c0f02794d27d7f83e0009ef4 diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 2fe110341359..686ec399f2a8 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -1657,7 +1657,12 @@ static struct ftrace_ops trace_ops __initdata = static __init void event_trace_self_test_with_function(void) { - register_ftrace_function(&trace_ops); + int ret; + ret = register_ftrace_function(&trace_ops); + if (WARN_ON(ret < 0)) { + pr_info("Failed to enable function tracer for event tests\n"); + return; + } pr_info("Running tests again, along with the function tracer\n"); event_trace_self_tests(); unregister_ftrace_function(&trace_ops);