| Message ID | 1459993411-2754735-3-git-send-email-ast@fb.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Apr 06, 2016 at 06:43:23PM -0700, Alexei Starovoitov wrote: > now all calls to perf_trace_buf_submit() pass 0 as 4th > argument which will be repurposed in the next patch which will > change the meaning of 1st arg of perf_tp_event() to event_type > > Signed-off-by: Alexei Starovoitov <ast@kernel.org> > --- > include/trace/perf.h | 7 ++----- > include/trace/trace_events.h | 3 --- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/include/trace/perf.h b/include/trace/perf.h > index 26486fcd74ce..6f7e37869065 100644 > --- a/include/trace/perf.h > +++ b/include/trace/perf.h > @@ -20,9 +20,6 @@ > #undef __get_bitmask > #define __get_bitmask(field) (char *)__get_dynamic_array(field) > > -#undef __perf_addr > -#define __perf_addr(a) (__addr = (a)) > - Ah, we're not using that anylonger.. Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
diff --git a/include/trace/perf.h b/include/trace/perf.h index 26486fcd74ce..6f7e37869065 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -20,9 +20,6 @@ #undef __get_bitmask #define __get_bitmask(field) (char *)__get_dynamic_array(field) -#undef __perf_addr -#define __perf_addr(a) (__addr = (a)) - #undef __perf_count #define __perf_count(c) (__count = (c)) @@ -38,7 +35,7 @@ perf_trace_##call(void *__data, proto) \ struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\ struct trace_event_raw_##call *entry; \ struct pt_regs *__regs; \ - u64 __addr = 0, __count = 1; \ + u64 __count = 1; \ struct task_struct *__task = NULL; \ struct hlist_head *head; \ int __entry_size; \ @@ -67,7 +64,7 @@ perf_trace_##call(void *__data, proto) \ \ { assign; } \ \ - perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ + perf_trace_buf_submit(entry, __entry_size, rctx, 0, \ __count, __regs, head, __task); \ } diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 170c93bbdbb7..80679a9fae65 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -652,9 +652,6 @@ static inline notrace int trace_event_get_offsets_##call( \ #undef TP_fast_assign #define TP_fast_assign(args...) args -#undef __perf_addr -#define __perf_addr(a) (a) - #undef __perf_count #define __perf_count(c) (c)
now all calls to perf_trace_buf_submit() pass 0 as 4th argument which will be repurposed in the next patch which will change the meaning of 1st arg of perf_tp_event() to event_type Signed-off-by: Alexei Starovoitov <ast@kernel.org> --- include/trace/perf.h | 7 ++----- include/trace/trace_events.h | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-)