lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 826/862] scsi: tracing: Fix compile error in trace_array calls when TRACING is disabled
    Date
    From: Arun Easi <aeasi@marvell.com>

    [ Upstream commit 1a77dd1c2bb5d4a58c16d198cf593720787c02e4 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/trace.h | 36 ++++++++++++++++++++++++++++++++++--
    1 file changed, 34 insertions(+), 2 deletions(-)

    diff --git a/include/linux/trace.h b/include/linux/trace.h
    index bf169612ffe1..b5e16e438448 100644
    --- a/include/linux/trace.h
    +++ b/include/linux/trace.h
    @@ -2,8 +2,6 @@
    #ifndef _LINUX_TRACE_H
    #define _LINUX_TRACE_H

    -#ifdef CONFIG_TRACING
    -
    #define TRACE_EXPORT_FUNCTION BIT(0)
    #define TRACE_EXPORT_EVENT BIT(1)
    #define TRACE_EXPORT_MARKER BIT(2)
    @@ -28,6 +26,8 @@ struct trace_export {
    int flags;
    };

    +#ifdef CONFIG_TRACING
    +
    int register_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_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 /* _LINUX_TRACE_H */
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:45    [W:8.791 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site