From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Max Kellermann <max.kellermann@ionos.com>,
Helge Deller <deller@gmx.de>, Sasha Levin <sashal@kernel.org>,
rostedt@goodmis.org, mhiramat@kernel.org,
James.Bottomley@HansenPartnership.com,
linux-trace-kernel@vger.kernel.org, linux-parisc@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 08/12] parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check
Date: Thu, 29 Feb 2024 15:40:30 -0500 [thread overview]
Message-ID: <20240229204039.2861519-8-sashal@kernel.org> (raw)
In-Reply-To: <20240229204039.2861519-1-sashal@kernel.org>
From: Max Kellermann <max.kellermann@ionos.com>
[ Upstream commit 250f5402e636a5cec9e0e95df252c3d54307210f ]
Fixes a bug revealed by -Wmissing-prototypes when
CONFIG_FUNCTION_GRAPH_TRACER is enabled but not CONFIG_DYNAMIC_FTRACE:
arch/parisc/kernel/ftrace.c:82:5: error: no previous prototype for 'ftrace_enable_ftrace_graph_caller' [-Werror=missing-prototypes]
82 | int ftrace_enable_ftrace_graph_caller(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/parisc/kernel/ftrace.c:88:5: error: no previous prototype for 'ftrace_disable_ftrace_graph_caller' [-Werror=missing-prototypes]
88 | int ftrace_disable_ftrace_graph_caller(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/parisc/kernel/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index 4d392e4ed3584..ac7253891d5ed 100644
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@ -78,7 +78,7 @@ void notrace __hot ftrace_function_trampoline(unsigned long parent,
#endif
}
-#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_FUNCTION_GRAPH_TRACER)
int ftrace_enable_ftrace_graph_caller(void)
{
static_key_enable(&ftrace_graph_enable.key);
--
2.43.0
next prev parent reply other threads:[~2024-02-29 20:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 20:40 [PATCH AUTOSEL 6.1 01/12] soc: microchip: Fix POLARFIRE_SOC_SYS_CTRL input prompt Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 02/12] RDMA/mlx5: Fix fortify source warning while accessing Eth segment Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 03/12] RDMA/mlx5: Relax DEVX access upon modify commands Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 04/12] riscv: dts: sifive: add missing #interrupt-cells to pmic Sasha Levin
2024-02-29 20:40 ` Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 05/12] x86/mm: Move is_vsyscall_vaddr() into asm/vsyscall.h Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 06/12] x86/mm: Disallow vsyscall page read for copy_from_kernel_nofault() Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 07/12] net/iucv: fix the allocation size of iucv_path_table array Sasha Levin
2024-02-29 20:40 ` Sasha Levin [this message]
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 09/12] block: sed-opal: handle empty atoms when parsing response Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 10/12] enic: Avoid false positive under FORTIFY_SOURCE Sasha Levin
2024-03-11 21:03 ` Pavel Machek
2024-03-18 12:50 ` Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 11/12] dm-verity, dm-crypt: align "struct bvec_iter" correctly Sasha Levin
2024-02-29 20:40 ` [PATCH AUTOSEL 6.1 12/12] arm64: dts: Fix dtc interrupt_provider warnings Sasha Levin
2024-02-29 20:40 ` Sasha Levin
2024-03-11 21:04 ` Pavel Machek
2024-03-11 21:04 ` Pavel Machek
2024-03-12 8:20 ` Geert Uytterhoeven
2024-03-12 8:20 ` Geert Uytterhoeven
2024-03-12 8:38 ` Pavel Machek
2024-03-12 8:38 ` Pavel Machek
2024-03-12 8:43 ` Geert Uytterhoeven
2024-03-12 8:43 ` Geert Uytterhoeven
2024-03-12 9:12 ` AngeloGioacchino Del Regno
2024-03-12 9:12 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240229204039.2861519-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=max.kellermann@ionos.com \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.