From: Arnd Bergmann <arnd@arndb.de>
To: Jiri Pirko <jiri@mellanox.com>
Cc: netdev@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
"David S . Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n
Date: Wed, 13 Jul 2016 23:03:37 +0200 [thread overview]
Message-ID: <20160713210338.1647521-1-arnd@arndb.de> (raw)
A driver calling trace_devlink_hwmsg cannot be built when modules are disabled:
include/trace/events/devlink.h: In function 'trace_event_get_offsets_devlink_hwmsg':
include/trace/events/devlink.h:25:51: error: dereferencing pointer to incomplete type 'struct module'
__string(owner_name, devlink->dev->driver->owner->name)
This changes the code to only print the module name when modules are actually
enabled, otherwise we hardcode the string "built-in".
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: e5224f0fe2ac ("devlink: add hardware messages tracing facility")
---
include/trace/events/devlink.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
index 333c32ac9bfa..26f92d3c7e9c 100644
--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@@ -22,7 +22,11 @@ TRACE_EVENT(devlink_hwmsg,
TP_STRUCT__entry(
__string(bus_name, devlink->dev->bus->name)
__string(dev_name, dev_name(devlink->dev))
+#ifdef CONFIG_MODULES
__string(owner_name, devlink->dev->driver->owner->name)
+#else
+ __string(owner_name, "built-in")
+#endif
__field(bool, incoming)
__field(unsigned long, type)
__dynamic_array(u8, buf, len)
@@ -32,7 +36,11 @@ TRACE_EVENT(devlink_hwmsg,
TP_fast_assign(
__assign_str(bus_name, devlink->dev->bus->name);
__assign_str(dev_name, dev_name(devlink->dev));
+#ifdef CONFIG_MODULES
__assign_str(owner_name, devlink->dev->driver->owner->name);
+#else
+ __assign_str(owner_name, "built-in");
+#endif
__entry->incoming = incoming;
__entry->type = type;
memcpy(__get_dynamic_array(buf), buf, len);
--
2.9.0
next reply other threads:[~2016-07-13 21:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-13 21:03 Arnd Bergmann [this message]
2016-07-13 21:03 ` [PATCH net-next 2/2] devlink: fix trace format string Arnd Bergmann
2016-07-14 6:21 ` [PATCH net-next 1/2] devlink: fix build error for CONFIG_MODULES=n Jiri Pirko
2016-07-14 8:12 ` Arnd Bergmann
2016-07-14 8:51 ` Jiri Pirko
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=20160713210338.1647521-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).