aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/Kconfig2
-rw-r--r--kernel/trace/trace_selftest.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e101c9a85f0f..9b49526ac0b5 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -77,7 +77,7 @@ config PREEMPT_TRACER
77 77
78config SYSPROF_TRACER 78config SYSPROF_TRACER
79 bool "Sysprof Tracer" 79 bool "Sysprof Tracer"
80 depends on DEBUG_KERNEL 80 depends on DEBUG_KERNEL && X86
81 select TRACING 81 select TRACING
82 help 82 help
83 This tracer provides the trace needed by the 'Sysprof' userspace 83 This tracer provides the trace needed by the 'Sysprof' userspace
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 033a6fb2e5ff..5588ecc40985 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -557,11 +557,6 @@ trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr)
557 ret = trace_test_buffer(tr, &count); 557 ret = trace_test_buffer(tr, &count);
558 trace->reset(tr); 558 trace->reset(tr);
559 559
560 if (!ret && !count) {
561 printk(KERN_CONT ".. no entries found ..");
562 ret = -1;
563 }
564
565 return ret; 560 return ret;
566} 561}
567#endif /* CONFIG_SYSPROF_TRACER */ 562#endif /* CONFIG_SYSPROF_TRACER */