---

yaml --- r: 142779 b: refs/heads/master c: bc2b687 h: refs/heads/master i: 142777: 77aa132 142775: f406099 v: v3
git-mirror · Apr 7, 2009 · e9ceb7c · e9ceb7c
1 parent a6ff120
commit e9ceb7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0dfa978c7a1699fb3506fbfcba0b6a5c4bd17ae
+refs/heads/master: bc2b6871c17b3aff79fb14e1a1c06c5f5a187f76
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -2369,9 +2369,9 @@ static const char readme_msg[] =
 	"# mkdir /debug\n"
 	"# mount -t debugfs nodev /debug\n\n"
 	"# cat /debug/tracing/available_tracers\n"
-	"wakeup preemptirqsoff preemptoff irqsoff ftrace sched_switch none\n\n"
+	"wakeup preemptirqsoff preemptoff irqsoff function sched_switch nop\n\n"
 	"# cat /debug/tracing/current_tracer\n"
-	"none\n"
+	"nop\n"
 	"# echo sched_switch > /debug/tracing/current_tracer\n"
 	"# cat /debug/tracing/current_tracer\n"
 	"sched_switch\n"