---

yaml --- r: 100630 b: refs/heads/master c: ef4ab15 h: refs/heads/master v: v3
git-mirror · May 23, 2008 · 7e8a74a · 7e8a74a
1 parent cb21c75
commit 7e8a74a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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 */