diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:40:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:40:37 -0500 |
| commit | bc722f508a5bcbb65a7bb0c7ce8e3934f5763a1a (patch) | |
| tree | d6494e409a671669614e7a08a5328e8def277225 /kernel/trace/trace_sysprof.c | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 770cb24345c0f6e0d47bd2b94aa6d67bea6f8b54 (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_sysprof.c')
| -rw-r--r-- | kernel/trace/trace_sysprof.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c index c771af4e8f1a..91fd19c2149f 100644 --- a/kernel/trace/trace_sysprof.c +++ b/kernel/trace/trace_sysprof.c | |||
| @@ -314,7 +314,7 @@ sysprof_sample_write(struct file *filp, const char __user *ubuf, | |||
| 314 | return cnt; | 314 | return cnt; |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | static struct file_operations sysprof_sample_fops = { | 317 | static const struct file_operations sysprof_sample_fops = { |
| 318 | .read = sysprof_sample_read, | 318 | .read = sysprof_sample_read, |
| 319 | .write = sysprof_sample_write, | 319 | .write = sysprof_sample_write, |
| 320 | }; | 320 | }; |