diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:43:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:43:01 -0800 |
| commit | 935cc9323ac33bb9b6cb853815e5c86f77e50607 (patch) | |
| tree | 6b48024b35b2d166de592ab3238e80c3e763f46a /Documentation/trace/ftrace.txt | |
| parent | 4ca5ded2bdc09259ad89915bac2d218e72cda351 (diff) | |
| parent | 03688970347bfea32823953a7ce5886d1713205f (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/documentation: Cover new frame pointer semantics
tracing/documentation: Fix a typo in ftrace.txt
ring-buffer: Check for end of page in iterator
ring-buffer: Check if ring buffer iterator has stale data
tracing: Prevent kernel oops with corrupted buffer
Diffstat (limited to 'Documentation/trace/ftrace.txt')
| -rw-r--r-- | Documentation/trace/ftrace.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 8179692fbb90..bab3040da548 100644 --- a/Documentation/trace/ftrace.txt +++ b/Documentation/trace/ftrace.txt @@ -1625,7 +1625,7 @@ If I am only interested in sys_nanosleep and hrtimer_interrupt: # echo sys_nanosleep hrtimer_interrupt \ > set_ftrace_filter - # echo ftrace > current_tracer + # echo function > current_tracer # echo 1 > tracing_enabled # usleep 1 # echo 0 > tracing_enabled |