Skip to content

Commit e93735b

Browse files
4astdavem330
authored andcommitted
perf: remove unused __addr variable
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 <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ec5e099 commit e93735b

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

include/trace/perf.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
#undef __get_bitmask
2121
#define __get_bitmask(field) (char *)__get_dynamic_array(field)
2222

23-
#undef __perf_addr
24-
#define __perf_addr(a) (__addr = (a))
25-
2623
#undef __perf_count
2724
#define __perf_count(c) (__count = (c))
2825

@@ -38,7 +35,7 @@ perf_trace_##call(void *__data, proto) \
3835
struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
3936
struct trace_event_raw_##call *entry; \
4037
struct pt_regs *__regs; \
41-
u64 __addr = 0, __count = 1; \
38+
u64 __count = 1; \
4239
struct task_struct *__task = NULL; \
4340
struct hlist_head *head; \
4441
int __entry_size; \
@@ -67,7 +64,7 @@ perf_trace_##call(void *__data, proto) \
6764
\
6865
{ assign; } \
6966
\
70-
perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \
67+
perf_trace_buf_submit(entry, __entry_size, rctx, 0, \
7168
__count, __regs, head, __task); \
7269
}
7370

include/trace/trace_events.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,9 +652,6 @@ static inline notrace int trace_event_get_offsets_##call( \
652652
#undef TP_fast_assign
653653
#define TP_fast_assign(args...) args
654654

655-
#undef __perf_addr
656-
#define __perf_addr(a) (a)
657-
658655
#undef __perf_count
659656
#define __perf_count(c) (c)
660657

0 commit comments

Comments
 (0)