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/ring_buffer.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/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f7473645b9c6..178858492a89 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -2606,7 +2606,7 @@ rb_simple_write(struct file *filp, const char __user *ubuf, | |||
| 2606 | return cnt; | 2606 | return cnt; |
| 2607 | } | 2607 | } |
| 2608 | 2608 | ||
| 2609 | static struct file_operations rb_simple_fops = { | 2609 | static const struct file_operations rb_simple_fops = { |
| 2610 | .open = tracing_open_generic, | 2610 | .open = tracing_open_generic, |
| 2611 | .read = rb_simple_read, | 2611 | .read = rb_simple_read, |
| 2612 | .write = rb_simple_write, | 2612 | .write = rb_simple_write, |