On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote: >> Every tracing file must have its own TRACE_SYSTEM defined. >> The iwlwifi tracepoint header broke this and added in the middle >> of the file: > [...] >> Unfortunately, this broke new code in the ftrace infrastructure. >> Moving each of these TRACE_SYSTEMs into their own trace file with >> just one TRACE_SYSTEM per file fixes the issue. >> >> Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> >> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> > > >> drivers/net/wireless/iwlwifi/iwl-devtrace-data.h | 79 ++++ >> drivers/net/wireless/iwlwifi/iwl-devtrace-io.h | 155 ++++++++ >> .../net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 200 ++++++++++ >> drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h | 97 +++++ >> drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h | 81 ++++ >> drivers/net/wireless/iwlwifi/iwl-devtrace.h | 438 +-------------------- >> 6 files changed, 618 insertions(+), 432 deletions(-) >> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-data.h >> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-io.h >> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h >> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h >> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h > > Looks good to me. > > Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > I had to make quite a few modifications since this patch was not based on iwlwifi-next, but I picked it up in our internal tree. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html