diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 08a08bab57a3..33ae2f196fa3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -4744,7 +4744,8 @@ static ssize_t | |||
4744 | rb_simple_read(struct file *filp, char __user *ubuf, | 4744 | rb_simple_read(struct file *filp, char __user *ubuf, |
4745 | size_t cnt, loff_t *ppos) | 4745 | size_t cnt, loff_t *ppos) |
4746 | { | 4746 | { |
4747 | struct ring_buffer *buffer = filp->private_data; | 4747 | struct trace_array *tr = filp->private_data; |
4748 | struct ring_buffer *buffer = tr->buffer; | ||
4748 | char buf[64]; | 4749 | char buf[64]; |
4749 | int r; | 4750 | int r; |
4750 | 4751 | ||
@@ -4762,7 +4763,8 @@ static ssize_t | |||
4762 | rb_simple_write(struct file *filp, const char __user *ubuf, | 4763 | rb_simple_write(struct file *filp, const char __user *ubuf, |
4763 | size_t cnt, loff_t *ppos) | 4764 | size_t cnt, loff_t *ppos) |
4764 | { | 4765 | { |
4765 | struct ring_buffer *buffer = filp->private_data; | 4766 | struct trace_array *tr = filp->private_data; |
4767 | struct ring_buffer *buffer = tr->buffer; | ||
4766 | unsigned long val; | 4768 | unsigned long val; |
4767 | int ret; | 4769 | int ret; |
4768 | 4770 | ||
@@ -4849,7 +4851,7 @@ static __init int tracer_init_debugfs(void) | |||
4849 | &trace_clock_fops); | 4851 | &trace_clock_fops); |
4850 | 4852 | ||
4851 | trace_create_file("tracing_on", 0644, d_tracer, | 4853 | trace_create_file("tracing_on", 0644, d_tracer, |
4852 | global_trace.buffer, &rb_simple_fops); | 4854 | &global_trace, &rb_simple_fops); |
4853 | 4855 | ||
4854 | #ifdef CONFIG_DYNAMIC_FTRACE | 4856 | #ifdef CONFIG_DYNAMIC_FTRACE |
4855 | trace_create_file("dyn_ftrace_total_info", 0444, d_tracer, | 4857 | trace_create_file("dyn_ftrace_total_info", 0444, d_tracer, |