Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7114743rwi; Mon, 24 Oct 2022 10:01:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7r4s7wcsqCHTQNk5DTDnOyZOAGTR+pSz1PxmzkhxIEefx7uAGV36MFnZ/4A9cCXsuFQaiU X-Received: by 2002:a50:ccc2:0:b0:460:4db2:5006 with SMTP id b2-20020a50ccc2000000b004604db25006mr22619103edj.369.1666630863645; Mon, 24 Oct 2022 10:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630863; cv=none; d=google.com; s=arc-20160816; b=S/U9cLw871pznTaPixyJuqLrW7npFqz6U5qPz/CqstTXFspRnA4V0zzf+r4hQMT0Ba rTRGddjdVTz5Ryg6CSf1Lg165FlVuW3svX1DOHnT015iTjGZqTWCvLSnEvz7VOC3c855 //egnGuVmr4W7sH7zPQCWWuORcipahFavFOcGWYzwyn0mxt9XR4thlV+qWV+Upy+eZ9T abV5u7UHDbbxJnCRsj9B05VzVPV5e24CJALk90JHZJoWXx3vf4ElVFYXU0EbKqQi6rqH e9FqDPyZ1jLKcW48N8JR1bLRdi+H56W3GNrAQfAD4V31g1uSyAQVtcx2Q01rjorVhKwh KXIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aCrVrmCgsXg/0gj68/SN/ZZ8DR1FtDZ1Blrqf3dGLX8=; b=mA7uMU3Hd1PLyv8fCIrkpULXAcUxE10JUdn4O4BEseITMqiUQPSGC6VfCduiFuHSDA oI974ayeeaoRvjgJfhcR5RoDN0ce44hu/rg/34OLRrnktfxHH2stogGL9/RGOpH0+qQN Cs1g4ZvNbjx0JeWCi8fIJIQ9e6UUTu1p6iZE03trppuRpEdvPZaNr2TNUQpPhVDxgYTb GRcUg/6H2qtfc6/OL4pg4vGgS2Kp9G0oDo05ghfyNraOd8ut/REYpzjH7IJ790oT52Bw 9so3PuNSTTq8DZZo5X63Z3usnM95MdsoGcYo3WLe/RsI+Y5ZpFV7PXUfJTv0hZs7zdIh LNnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NV2MiGta; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n17-20020a170906841100b0078c6a12ff3dsi224432ejx.215.2022.10.24.10.00.32; Mon, 24 Oct 2022 10:01:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NV2MiGta; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233970AbiJXQwV (ORCPT + 99 others); Mon, 24 Oct 2022 12:52:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235185AbiJXQtL (ORCPT ); Mon, 24 Oct 2022 12:49:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F8A3255B1; Mon, 24 Oct 2022 08:32:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 97657B8172E; Mon, 24 Oct 2022 12:55:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1E8BC433D7; Mon, 24 Oct 2022 12:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616104; bh=AovMnUVFaDgnuucVmCvW2YnL6/FL1thsQNXgFxRaPiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NV2MiGtaNMUKjHE1LMuHIO+Y1BNncQFFKBFDWvdJ+uSGP97TEwW9hgTSww95DRW2V H035yxBrWJHN9vpnWI4+cMmDVNdvBSdFFp2lW4YLqdaojLCxSByuEIYUFj1W4TnEzp iuEG4+PbnpkO3+Fd19DqtguYaSIdNP4J/L05uaVs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , "Steven Rostedt (Google)" , Arun Easi , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.15 503/530] scsi: tracing: Fix compile error in trace_array calls when TRACING is disabled Date: Mon, 24 Oct 2022 13:34:07 +0200 Message-Id: <20221024113107.805362542@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arun Easi [ 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 Reviewed-by: Steven Rostedt (Google) Signed-off-by: Arun Easi Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- 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