From 7e8a74a1a31f3c5935aa48b06187654b870acfb4 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 12 May 2008 21:20:48 +0200 Subject: [PATCH] --- yaml --- r: 100630 b: refs/heads/master c: ef4ab15ff34fd9c65e92bee70f58e7179da881c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/Kconfig | 2 +- trunk/kernel/trace/trace_selftest.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4a851a4c1201..5a792c5b3124 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 842af315e8b0adad58fc642eaa5e6f53525e0534 +refs/heads/master: ef4ab15ff34fd9c65e92bee70f58e7179da881c5 diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig index e101c9a85f0f..9b49526ac0b5 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/kernel/trace/Kconfig @@ -77,7 +77,7 @@ config PREEMPT_TRACER config SYSPROF_TRACER bool "Sysprof Tracer" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && X86 select TRACING help This tracer provides the trace needed by the 'Sysprof' userspace diff --git a/trunk/kernel/trace/trace_selftest.c b/trunk/kernel/trace/trace_selftest.c index 033a6fb2e5ff..5588ecc40985 100644 --- a/trunk/kernel/trace/trace_selftest.c +++ b/trunk/kernel/trace/trace_selftest.c @@ -557,11 +557,6 @@ trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr) ret = trace_test_buffer(tr, &count); trace->reset(tr); - if (!ret && !count) { - printk(KERN_CONT ".. no entries found .."); - ret = -1; - } - return ret; } #endif /* CONFIG_SYSPROF_TRACER */