diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 17:45:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 17:45:44 (GMT) |
| commit | a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a (patch) | |
| tree | 89dce7d51c11ea56150e4f5613a28369e238f90e /kernel/trace/ftrace.c | |
| parent | efcd9e0b91bcb92a1dd530d1a1f26eb83a5d21e2 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
| download | linux-fsl-qoriq-a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a.tar.xz | |
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 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 37ba67e..9c451a1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -740,7 +740,7 @@ ftrace_profile_write(struct file *filp, const char __user *ubuf, out: mutex_unlock(&ftrace_profile_lock); - filp->f_pos += cnt; + *ppos += cnt; return cnt; } |