diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /kernel/trace/trace.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c820b0310a12..b20d3ec75de9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -2440,7 +2440,7 @@ tracing_trace_options_write(struct file *filp, const char __user *ubuf, | |||
| 2440 | return ret; | 2440 | return ret; |
| 2441 | } | 2441 | } |
| 2442 | 2442 | ||
| 2443 | filp->f_pos += cnt; | 2443 | *ppos += cnt; |
| 2444 | 2444 | ||
| 2445 | return cnt; | 2445 | return cnt; |
| 2446 | } | 2446 | } |
| @@ -2582,7 +2582,7 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf, | |||
| 2582 | } | 2582 | } |
| 2583 | mutex_unlock(&trace_types_lock); | 2583 | mutex_unlock(&trace_types_lock); |
| 2584 | 2584 | ||
| 2585 | filp->f_pos += cnt; | 2585 | *ppos += cnt; |
| 2586 | 2586 | ||
| 2587 | return cnt; | 2587 | return cnt; |
| 2588 | } | 2588 | } |
| @@ -2764,7 +2764,7 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, | |||
| 2764 | if (err) | 2764 | if (err) |
| 2765 | return err; | 2765 | return err; |
| 2766 | 2766 | ||
| 2767 | filp->f_pos += ret; | 2767 | *ppos += ret; |
| 2768 | 2768 | ||
| 2769 | return ret; | 2769 | return ret; |
| 2770 | } | 2770 | } |
| @@ -3299,7 +3299,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, | |||
| 3299 | } | 3299 | } |
| 3300 | } | 3300 | } |
| 3301 | 3301 | ||
| 3302 | filp->f_pos += cnt; | 3302 | *ppos += cnt; |
| 3303 | 3303 | ||
| 3304 | /* If check pages failed, return ENOMEM */ | 3304 | /* If check pages failed, return ENOMEM */ |
| 3305 | if (tracing_disabled) | 3305 | if (tracing_disabled) |