From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 11 Feb 2025 10:34:49 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v6.6.78~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b69e6f80dcf3445702a536bf19f44a2d9e3fec02;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch
---

diff --git a/queue-6.1/mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch b/queue-6.1/mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch
new file mode 100644
index 0000000000..33aeb3e74d
--- /dev/null
+++ b/queue-6.1/mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch
@@ -0,0 +1,47 @@
+From ddd068d81445b17ac0bed084dfeb9e58b4df3ddd Mon Sep 17 00:00:00 2001
+From: WangYuli <wangyuli@uniontech.com>
+Date: Sat, 4 Jan 2025 22:47:08 +0800
+Subject: MIPS: ftrace: Declare ftrace_get_parent_ra_addr() as static
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: WangYuli <wangyuli@uniontech.com>
+
+commit ddd068d81445b17ac0bed084dfeb9e58b4df3ddd upstream.
+
+Declare ftrace_get_parent_ra_addr() as static to suppress clang
+compiler warning that 'no previous prototype'. This function is
+not intended to be called from other parts.
+
+Fix follow error with clang-19:
+
+arch/mips/kernel/ftrace.c:251:15: error: no previous prototype for function 'ftrace_get_parent_ra_addr' [-Werror,-Wmissing-prototypes]
+  251 | unsigned long ftrace_get_parent_ra_addr(unsigned long self_ra, unsigned long
+      |               ^
+arch/mips/kernel/ftrace.c:251:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
+  251 | unsigned long ftrace_get_parent_ra_addr(unsigned long self_ra, unsigned long
+      | ^
+      | static
+1 error generated.
+
+Signed-off-by: WangYuli <wangyuli@uniontech.com>
+Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/kernel/ftrace.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/kernel/ftrace.c
++++ b/arch/mips/kernel/ftrace.c
+@@ -248,7 +248,7 @@ int ftrace_disable_ftrace_graph_caller(v
+ #define S_R_SP	(0xafb0 << 16)	/* s{d,w} R, offset(sp) */
+ #define OFFSET_MASK	0xffff	/* stack offset range: 0 ~ PT_SIZE */
+ 
+-unsigned long ftrace_get_parent_ra_addr(unsigned long self_ra, unsigned long
++static unsigned long ftrace_get_parent_ra_addr(unsigned long self_ra, unsigned long
+ 		old_parent_ra, unsigned long parent_ra_addr, unsigned long fp)
+ {
+ 	unsigned long sp, ip, tmp;
diff --git a/queue-6.1/series b/queue-6.1/series
index 1cdda4ac08..1b62815e33 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -449,3 +449,4 @@ rtc-zynqmp-fix-optional-clock-name-property.patch
 io_uring-fix-multishots-with-selected-buffers.patch
 io_uring-fix-io_req_prep_async-with-provided-buffers.patch
 io_uring-rw-commit-provided-buffer-state-on-async.patch
+mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch