diff options
author | Linus Torvalds | 2009-11-02 18:45:44 +0100 |
---|---|---|
committer | Linus Torvalds | 2009-11-02 18:45:44 +0100 |
commit | a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a (patch) | |
tree | 89dce7d51c11ea56150e4f5613a28369e238f90e /include | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | tracing: Remove cpu arg from the rb_time_stamp() function (diff) | |
download | kernel-qcow2-linux-a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a.tar.gz kernel-qcow2-linux-a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a.tar.xz kernel-qcow2-linux-a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a.zip |
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: Remove cpu arg from the rb_time_stamp() function
tracing: Fix comment typo and documentation example
tracing: Fix trace_seq_printf() return value
tracing: Update *ppos instead of filp->f_pos
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/trace_seq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h index c134dd1fe6b6..09077f6ed128 100644 --- a/include/linux/trace_seq.h +++ b/include/linux/trace_seq.h @@ -7,7 +7,7 @@ /* * Trace sequences are used to allow a function to call several other functions - * to create a string of data to use (up to a max of PAGE_SIZE. + * to create a string of data to use (up to a max of PAGE_SIZE). */ struct trace_seq { |