From 6fa3736791e1c40970d5d09921c1601f35f4c9c4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 16:06:37 +0200 Subject: [PATCH] 6.1-stable patches added patches: mips-cevt-ds1287-add-missing-ds1287.h-include.patch mips-dec-declare-which_prom-as-static.patch mips-ds1287-match-ds1287_set_base_clock-function-types.patch --- ...-ds1287-add-missing-ds1287.h-include.patch | 49 +++++++++++++++++++ ...ips-dec-declare-which_prom-as-static.patch | 44 +++++++++++++++++ ...ds1287_set_base_clock-function-types.patch | 46 +++++++++++++++++ queue-6.1/series | 3 ++ 4 files changed, 142 insertions(+) create mode 100644 queue-6.1/mips-cevt-ds1287-add-missing-ds1287.h-include.patch create mode 100644 queue-6.1/mips-dec-declare-which_prom-as-static.patch create mode 100644 queue-6.1/mips-ds1287-match-ds1287_set_base_clock-function-types.patch diff --git a/queue-6.1/mips-cevt-ds1287-add-missing-ds1287.h-include.patch b/queue-6.1/mips-cevt-ds1287-add-missing-ds1287.h-include.patch new file mode 100644 index 0000000000..c26036ac9e --- /dev/null +++ b/queue-6.1/mips-cevt-ds1287-add-missing-ds1287.h-include.patch @@ -0,0 +1,49 @@ +From f3be225f338a578851a7b607a409f476354a8deb Mon Sep 17 00:00:00 2001 +From: WangYuli +Date: Tue, 18 Feb 2025 20:57:23 +0800 +Subject: MIPS: cevt-ds1287: Add missing ds1287.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: WangYuli + +commit f3be225f338a578851a7b607a409f476354a8deb upstream. + +Address the issue of cevt-ds1287.c not including the ds1287.h header +file. + +Fix follow errors with gcc-14 when -Werror: + +arch/mips/kernel/cevt-ds1287.c:15:5: error: no previous prototype for ‘ds1287_timer_state’ [-Werror=missing-prototypes] + 15 | int ds1287_timer_state(void) + | ^~~~~~~~~~~~~~~~~~ +arch/mips/kernel/cevt-ds1287.c:20:5: error: no previous prototype for ‘ds1287_set_base_clock’ [-Werror=missing-prototypes] + 20 | int ds1287_set_base_clock(unsigned int hz) + | ^~~~~~~~~~~~~~~~~~~~~ +arch/mips/kernel/cevt-ds1287.c:103:12: error: no previous prototype for ‘ds1287_clockevent_init’ [-Werror=missing-prototypes] + 103 | int __init ds1287_clockevent_init(int irq) + | ^~~~~~~~~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors +make[7]: *** [scripts/Makefile.build:207: arch/mips/kernel/cevt-ds1287.o] Error 1 +make[7]: *** Waiting for unfinished jobs.... +make[6]: *** [scripts/Makefile.build:465: arch/mips/kernel] Error 2 +make[6]: *** Waiting for unfinished jobs.... + +Signed-off-by: WangYuli +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/kernel/cevt-ds1287.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/mips/kernel/cevt-ds1287.c ++++ b/arch/mips/kernel/cevt-ds1287.c +@@ -10,6 +10,7 @@ + #include + #include + ++#include + #include + + int ds1287_timer_state(void) diff --git a/queue-6.1/mips-dec-declare-which_prom-as-static.patch b/queue-6.1/mips-dec-declare-which_prom-as-static.patch new file mode 100644 index 0000000000..1088490022 --- /dev/null +++ b/queue-6.1/mips-dec-declare-which_prom-as-static.patch @@ -0,0 +1,44 @@ +From 55fa5868519bc48a7344a4c070efa2f4468f2167 Mon Sep 17 00:00:00 2001 +From: WangYuli +Date: Tue, 18 Feb 2025 20:54:31 +0800 +Subject: MIPS: dec: Declare which_prom() as static +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: WangYuli + +commit 55fa5868519bc48a7344a4c070efa2f4468f2167 upstream. + +Declare which_prom() as static to suppress gcc compiler warning that +'missing-prototypes'. This function is not intended to be called +from other parts. + +Fix follow error with gcc-14 when -Werror: + +arch/mips/dec/prom/init.c:45:13: error: no previous prototype for ‘which_prom’ [-Werror=missing-prototypes] + 45 | void __init which_prom(s32 magic, s32 *prom_vec) + | ^~~~~~~~~~ +cc1: all warnings being treated as errors +make[6]: *** [scripts/Makefile.build:207: arch/mips/dec/prom/init.o] Error 1 +make[5]: *** [scripts/Makefile.build:465: arch/mips/dec/prom] Error 2 +make[5]: *** Waiting for unfinished jobs.... + +Signed-off-by: WangYuli +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/dec/prom/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/dec/prom/init.c ++++ b/arch/mips/dec/prom/init.c +@@ -42,7 +42,7 @@ int (*__pmax_close)(int); + * Detect which PROM the DECSTATION has, and set the callback vectors + * appropriately. + */ +-void __init which_prom(s32 magic, s32 *prom_vec) ++static void __init which_prom(s32 magic, s32 *prom_vec) + { + /* + * No sign of the REX PROM's magic number means we assume a non-REX diff --git a/queue-6.1/mips-ds1287-match-ds1287_set_base_clock-function-types.patch b/queue-6.1/mips-ds1287-match-ds1287_set_base_clock-function-types.patch new file mode 100644 index 0000000000..761096de37 --- /dev/null +++ b/queue-6.1/mips-ds1287-match-ds1287_set_base_clock-function-types.patch @@ -0,0 +1,46 @@ +From a759109b234385b74d2f5f4c86b5f59b3201ec12 Mon Sep 17 00:00:00 2001 +From: WangYuli +Date: Tue, 18 Feb 2025 20:57:55 +0800 +Subject: MIPS: ds1287: Match ds1287_set_base_clock() function types +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: WangYuli + +commit a759109b234385b74d2f5f4c86b5f59b3201ec12 upstream. + +Synchronize the declaration of ds1287_set_base_clock() between +cevt-ds1287.c and ds1287.h. + +Fix follow error with gcc-14 when -Werror: + +arch/mips/kernel/cevt-ds1287.c:21:5: error: conflicting types for ‘ds1287_set_base_clock’; have ‘int(unsigned int)’ + 21 | int ds1287_set_base_clock(unsigned int hz) + | ^~~~~~~~~~~~~~~~~~~~~ +In file included from arch/mips/kernel/cevt-ds1287.c:13: +./arch/mips/include/asm/ds1287.h:11:13: note: previous declaration of ‘ds1287_set_base_clock’ with type ‘void(unsigned int)’ + 11 | extern void ds1287_set_base_clock(unsigned int clock); + | ^~~~~~~~~~~~~~~~~~~~~ +make[7]: *** [scripts/Makefile.build:207: arch/mips/kernel/cevt-ds1287.o] Error 1 +make[6]: *** [scripts/Makefile.build:465: arch/mips/kernel] Error 2 +make[6]: *** Waiting for unfinished jobs.... + +Signed-off-by: WangYuli +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/ds1287.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/ds1287.h ++++ b/arch/mips/include/asm/ds1287.h +@@ -8,7 +8,7 @@ + #define __ASM_DS1287_H + + extern int ds1287_timer_state(void); +-extern void ds1287_set_base_clock(unsigned int clock); ++extern int ds1287_set_base_clock(unsigned int hz); + extern int ds1287_clockevent_init(int irq); + + #endif diff --git a/queue-6.1/series b/queue-6.1/series index 59d453cab4..9feeebfa31 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -287,3 +287,6 @@ mm-fix-apply_to_existing_page_range.patch sign-file-extract-cert-move-common-ssl-helper-functions-to-a-header.patch sign-file-extract-cert-avoid-using-deprecated-err_get_error_line.patch sign-file-extract-cert-use-pkcs11-provider-for-openssl-major-3.patch +mips-dec-declare-which_prom-as-static.patch +mips-cevt-ds1287-add-missing-ds1287.h-include.patch +mips-ds1287-match-ds1287_set_base_clock-function-types.patch -- 2.47.3