diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-18 12:15:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-18 12:15:41 -0400 |
| commit | 0130b2d7010fe8e046b7a6c44911a1d3d0d16c96 (patch) | |
| tree | e4fb22c311a2ca8da64528538646d1e2579f4447 /kernel | |
| parent | 80193195f87ebca6d7417516d6edeb3969631c15 (diff) | |
| parent | 88fc86c283d9c3854e67e4155808027bc2519eb6 (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Append prompt in /debug/tracing/README file
x86/function-graph: fix constraint for recording old return value
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a884c09006c4..cda81ec58d9f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -2380,7 +2380,7 @@ static const char readme_msg[] = | |||
| 2380 | "# echo print-parent > /debug/tracing/trace_options\n" | 2380 | "# echo print-parent > /debug/tracing/trace_options\n" |
| 2381 | "# echo 1 > /debug/tracing/tracing_enabled\n" | 2381 | "# echo 1 > /debug/tracing/tracing_enabled\n" |
| 2382 | "# cat /debug/tracing/trace > /tmp/trace.txt\n" | 2382 | "# cat /debug/tracing/trace > /tmp/trace.txt\n" |
| 2383 | "echo 0 > /debug/tracing/tracing_enabled\n" | 2383 | "# echo 0 > /debug/tracing/tracing_enabled\n" |
| 2384 | ; | 2384 | ; |
| 2385 | 2385 | ||
| 2386 | static ssize_t | 2386 | static ssize_t |