diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:20 +0100 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /kernel/trace/ftrace.c | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 b10c0d90a6f..1ed514fe3a3 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -751,7 +751,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; } |