From: Alexei Starovoitov <ast@fb•com>
To: <davem@davemloft•net>
Cc: <daniel@iogearbox•net>, <torvalds@linux-foundation•org>,
<peterz@infradead•org>, <rostedt@goodmis•org>,
<netdev@vger•kernel.org>, <kernel-team@fb•com>,
<linux-api@vger•kernel.org>
Subject: [PATCH v5 bpf-next 02/10] net/mediatek: disambiguate mt76 vs mt7601u trace events
Date: Fri, 23 Mar 2018 19:30:30 -0700 [thread overview]
Message-ID: <20180324023038.938665-3-ast@fb.com> (raw)
In-Reply-To: <20180324023038.938665-1-ast@fb.com>
From: Alexei Starovoitov <ast@kernel•org>
two trace events defined with the same name and both unused.
They conflict in allyesconfig build. Rename one of them.
Signed-off-by: Alexei Starovoitov <ast@kernel•org>
---
drivers/net/wireless/mediatek/mt7601u/trace.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt7601u/trace.h b/drivers/net/wireless/mediatek/mt7601u/trace.h
index 289897300ef0..82c8898b9076 100644
--- a/drivers/net/wireless/mediatek/mt7601u/trace.h
+++ b/drivers/net/wireless/mediatek/mt7601u/trace.h
@@ -34,7 +34,7 @@
#define REG_PR_FMT "%04x=%08x"
#define REG_PR_ARG __entry->reg, __entry->val
-DECLARE_EVENT_CLASS(dev_reg_evt,
+DECLARE_EVENT_CLASS(dev_reg_evtu,
TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
TP_ARGS(dev, reg, val),
TP_STRUCT__entry(
@@ -51,12 +51,12 @@ DECLARE_EVENT_CLASS(dev_reg_evt,
)
);
-DEFINE_EVENT(dev_reg_evt, reg_read,
+DEFINE_EVENT(dev_reg_evtu, reg_read,
TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
TP_ARGS(dev, reg, val)
);
-DEFINE_EVENT(dev_reg_evt, reg_write,
+DEFINE_EVENT(dev_reg_evtu, reg_write,
TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
TP_ARGS(dev, reg, val)
);
--
2.9.5
next prev parent reply other threads:[~2018-03-24 2:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 2:30 [PATCH v5 bpf-next 00/10] bpf, tracing: introduce bpf raw tracepoints Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 01/10] treewide: remove large struct-pass-by-value from tracepoint arguments Alexei Starovoitov
2018-03-24 2:30 ` Alexei Starovoitov [this message]
2018-03-24 2:30 ` [PATCH v5 bpf-next 03/10] net/mac802154: disambiguate mac80215 vs mac802154 trace events Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 04/10] net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 05/10] macro: introduce COUNT_ARGS() macro Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 06/10] tracepoint: compute num_args at build time Alexei Starovoitov
2018-03-26 15:02 ` Steven Rostedt
2018-03-26 15:14 ` Mathieu Desnoyers
2018-03-26 15:42 ` Alexei Starovoitov
2018-03-26 15:55 ` Mathieu Desnoyers
2018-03-26 16:08 ` Alexei Starovoitov
2018-03-26 16:17 ` Mathieu Desnoyers
2018-03-26 16:25 ` Alexei Starovoitov
2018-03-26 16:35 ` Steven Rostedt
2018-03-26 16:47 ` Alexei Starovoitov
2018-03-26 17:04 ` Steven Rostedt
2018-03-26 16:57 ` Mathieu Desnoyers
2018-03-26 17:55 ` Alexei Starovoitov
2018-03-26 18:11 ` Steven Rostedt
2018-03-26 18:39 ` Alexei Starovoitov
2018-03-26 18:48 ` Steven Rostedt
2018-03-26 21:27 ` Mathieu Desnoyers
2018-03-26 15:56 ` Steven Rostedt
2018-03-26 16:31 ` Steven Rostedt
2018-03-24 2:30 ` [PATCH v5 bpf-next 07/10] bpf: introduce BPF_RAW_TRACEPOINT Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 08/10] libbpf: add bpf_raw_tracepoint_open helper Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 09/10] samples/bpf: raw tracepoint test Alexei Starovoitov
2018-03-24 2:30 ` [PATCH v5 bpf-next 10/10] selftests/bpf: test for bpf_get_stackid() from raw tracepoints Alexei Starovoitov
2018-03-24 2:35 ` [PATCH v5 bpf-next 00/10] bpf, tracing: introduce bpf " Alexei Starovoitov
2018-03-26 8:28 ` Daniel Borkmann
2018-03-26 15:04 ` Steven Rostedt
2018-03-26 15:32 ` Daniel Borkmann
2018-03-26 15:47 ` Steven Rostedt
2018-03-26 16:00 ` Alexei Starovoitov
2018-03-26 16:16 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180324023038.938665-3-ast@fb.com \
--to=ast@fb$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=kernel-team@fb$(echo .)com \
--cc=linux-api@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox