diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-18 12:13:33 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-18 12:13:33 -0400 |
commit | 16ee6576e25b83806d26eb771138249fcfb5eddc (patch) | |
tree | 7c717b80f28b5c59ba673dc00f2ca9bd0fc068d4 /kernel/trace/trace.c | |
parent | 16fa7e8200fb9066b77a3f27cbed8e4a9fc71998 (diff) | |
parent | 9b63776fa3ca96c4ecda76f6fa947b7b0add66ac (diff) |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch:
"perf tools: Move parse event automated tests to separated object"
That depends on:
commit e7c72d8
perf tools: Add 'G' and 'H' modifiers to event parsing
Conflicts:
tools/perf/builtin-stat.c
Conflicted with the recent 'perf_target' patches when checking the
result of perf_evsel open routines to see if a retry is needed to cope
with older kernels where the exclude guest/host perf_event_attr bits
were not used.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
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 48ef4960ec90..509e8615f504 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -4759,7 +4759,8 @@ static ssize_t | |||
4759 | rb_simple_read(struct file *filp, char __user *ubuf, | 4759 | rb_simple_read(struct file *filp, char __user *ubuf, |
4760 | size_t cnt, loff_t *ppos) | 4760 | size_t cnt, loff_t *ppos) |
4761 | { | 4761 | { |
4762 | struct ring_buffer *buffer = filp->private_data; | 4762 | struct trace_array *tr = filp->private_data; |
4763 | struct ring_buffer *buffer = tr->buffer; | ||
4763 | char buf[64]; | 4764 | char buf[64]; |
4764 | int r; | 4765 | int r; |
4765 | 4766 | ||
@@ -4777,7 +4778,8 @@ static ssize_t | |||
4777 | rb_simple_write(struct file *filp, const char __user *ubuf, | 4778 | rb_simple_write(struct file *filp, const char __user *ubuf, |
4778 | size_t cnt, loff_t *ppos) | 4779 | size_t cnt, loff_t *ppos) |
4779 | { | 4780 | { |
4780 | struct ring_buffer *buffer = filp->private_data; | 4781 | struct trace_array *tr = filp->private_data; |
4782 | struct ring_buffer *buffer = tr->buffer; | ||
4781 | unsigned long val; | 4783 | unsigned long val; |
4782 | int ret; | 4784 | int ret; |
4783 | 4785 | ||
@@ -4864,7 +4866,7 @@ static __init int tracer_init_debugfs(void) | |||
4864 | &trace_clock_fops); | 4866 | &trace_clock_fops); |
4865 | 4867 | ||
4866 | trace_create_file("tracing_on", 0644, d_tracer, | 4868 | trace_create_file("tracing_on", 0644, d_tracer, |
4867 | global_trace.buffer, &rb_simple_fops); | 4869 | &global_trace, &rb_simple_fops); |
4868 | 4870 | ||
4869 | #ifdef CONFIG_DYNAMIC_FTRACE | 4871 | #ifdef CONFIG_DYNAMIC_FTRACE |
4870 | trace_create_file("dyn_ftrace_total_info", 0444, d_tracer, | 4872 | trace_create_file("dyn_ftrace_total_info", 0444, d_tracer, |