c5ef935d01
Every tracing file must have its own TRACE_SYSTEM defined. The iwlwifi tracepoint header broke this and added in the middle of the file: #undef TRACE_SYSTEM #define TRACE_SYSTEM iwlwifi_io #undef TRACE_SYSTEM #define TRACE_SYSTEM iwlwifi_ucode #undef TRACE_SYSTEM #define TRACE_SYSTEM iwlwifi_msg #undef TRACE_SYSTEM #define TRACE_SYSTEM iwlwifi_data #undef TRACE_SYSTEM #define TRACE_SYSTEM iwlwifi 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. Link: http://lkml.kernel.org/r/1428479094.2809.3.camel@sipsolutions.net Reviewed-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
82 lines
2.5 KiB
C
82 lines
2.5 KiB
C
/******************************************************************************
|
|
*
|
|
* Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
|
|
*
|
|
* The full GNU General Public License is included in this distribution in the
|
|
* file called LICENSE.
|
|
*
|
|
* Contact Information:
|
|
* Intel Linux Wireless <ilw@linux.intel.com>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*
|
|
*****************************************************************************/
|
|
|
|
#if !defined(__IWLWIFI_DEVICE_TRACE_UCODE) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define __IWLWIFI_DEVICE_TRACE_UCODE
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM iwlwifi_ucode
|
|
|
|
TRACE_EVENT(iwlwifi_dev_ucode_cont_event,
|
|
TP_PROTO(const struct device *dev, u32 time, u32 data, u32 ev),
|
|
TP_ARGS(dev, time, data, ev),
|
|
TP_STRUCT__entry(
|
|
DEV_ENTRY
|
|
|
|
__field(u32, time)
|
|
__field(u32, data)
|
|
__field(u32, ev)
|
|
),
|
|
TP_fast_assign(
|
|
DEV_ASSIGN;
|
|
__entry->time = time;
|
|
__entry->data = data;
|
|
__entry->ev = ev;
|
|
),
|
|
TP_printk("[%s] EVT_LOGT:%010u:0x%08x:%04u",
|
|
__get_str(dev), __entry->time, __entry->data, __entry->ev)
|
|
);
|
|
|
|
TRACE_EVENT(iwlwifi_dev_ucode_wrap_event,
|
|
TP_PROTO(const struct device *dev, u32 wraps, u32 n_entry, u32 p_entry),
|
|
TP_ARGS(dev, wraps, n_entry, p_entry),
|
|
TP_STRUCT__entry(
|
|
DEV_ENTRY
|
|
|
|
__field(u32, wraps)
|
|
__field(u32, n_entry)
|
|
__field(u32, p_entry)
|
|
),
|
|
TP_fast_assign(
|
|
DEV_ASSIGN;
|
|
__entry->wraps = wraps;
|
|
__entry->n_entry = n_entry;
|
|
__entry->p_entry = p_entry;
|
|
),
|
|
TP_printk("[%s] wraps=#%02d n=0x%X p=0x%X",
|
|
__get_str(dev), __entry->wraps, __entry->n_entry,
|
|
__entry->p_entry)
|
|
);
|
|
#endif /* __IWLWIFI_DEVICE_TRACE_UCODE */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE iwl-devtrace-ucode
|
|
#include <trace/define_trace.h>
|