nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

scsi: tracing: Fix compile error in trace_array calls when TRACING is disabled

Browse source 
Fix this compilation error seen when CONFIG_TRACING is not enabled:

drivers/scsi/qla2xxx/qla_os.c: In function 'qla_trace_init':
drivers/scsi/qla2xxx/qla_os.c:2854:25: error: implicit declaration of function
'trace_array_get_by_name'; did you mean 'trace_array_set_clr_event'?
[-Werror=implicit-function-declaration]
 2854 |         qla_trc_array = trace_array_get_by_name("qla2xxx");
      |                         ^~~~~~~~~~~~~~~~~~~~~~~
      |                         trace_array_set_clr_event

drivers/scsi/qla2xxx/qla_os.c: In function 'qla_trace_uninit':
drivers/scsi/qla2xxx/qla_os.c:2869:9: error: implicit declaration of function
'trace_array_put' [-Werror=implicit-function-declaration]
 2869 |         trace_array_put(qla_trc_array);
      |         ^~~~~~~~~~~~~~~

Link: https://lore.kernel.org/r/20220907233308.4153-2-aeasi@marvell.com
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Arun Easi <aeasi@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Arun Easi 2022-09-07 16:33:08 -07:00 committed by Martin K. Petersen
parent 7f615c1b59
commit 1a77dd1c2b
1 changed files with 34 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

36
include/linux/trace.h
View file

@ -2,8 +2,6 @@
#ifndef _LINUX_TRACE_H #ifndef _LINUX_TRACE_H
#define _LINUX_TRACE_H #define _LINUX_TRACE_H
#ifdef CONFIG_TRACING
#define TRACE_EXPORT_FUNCTION BIT(0) #define TRACE_EXPORT_FUNCTION BIT(0)
#define TRACE_EXPORT_EVENT BIT(1) #define TRACE_EXPORT_EVENT BIT(1)
#define TRACE_EXPORT_MARKER BIT(2) #define TRACE_EXPORT_MARKER BIT(2)
@ -28,6 +26,8 @@ struct trace_export {
int flags; int flags;
}; };
#ifdef CONFIG_TRACING
int register_ftrace_export(struct trace_export *export); int register_ftrace_export(struct trace_export *export);
int unregister_ftrace_export(struct trace_export *export); int unregister_ftrace_export(struct trace_export *export);
@ -48,6 +48,38 @@ void osnoise_arch_unregister(void);
void osnoise_trace_irq_entry(int id); void osnoise_trace_irq_entry(int id);
void osnoise_trace_irq_exit(int id, const char *desc); void osnoise_trace_irq_exit(int id, const char *desc);
#else /* CONFIG_TRACING */
static inline int register_ftrace_export(struct trace_export *export)
{
return -EINVAL;
}
static inline int unregister_ftrace_export(struct trace_export *export)
{
return 0;
}
static inline void trace_printk_init_buffers(void)
{
}
static inline int trace_array_printk(struct trace_array *tr, unsigned long ip,
const char *fmt, ...)
{
return 0;
}
static inline int trace_array_init_printk(struct trace_array *tr)
{
return -EINVAL;
}
static inline void trace_array_put(struct trace_array *tr)
{
}
static inline struct trace_array *trace_array_get_by_name(const char *name)
{
return NULL;
}
static inline int trace_array_destroy(struct trace_array *tr)
{
return 0;
}
#endif /* CONFIG_TRACING */ #endif /* CONFIG_TRACING */
#endif /* _LINUX_TRACE_H */ #endif /* _LINUX_TRACE_H */