From: Greg Kroah-Hartman Date: Tue, 29 Apr 2025 15:48:57 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.4.293~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=298d11a2d831452fb3cf59befa3f227b9b8d4983;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: mips-cm-fix-warning-if-mips_cm-is-disabled.patch --- diff --git a/queue-5.4/mips-cm-fix-warning-if-mips_cm-is-disabled.patch b/queue-5.4/mips-cm-fix-warning-if-mips_cm-is-disabled.patch new file mode 100644 index 0000000000..272bbfb37c --- /dev/null +++ b/queue-5.4/mips-cm-fix-warning-if-mips_cm-is-disabled.patch @@ -0,0 +1,38 @@ +From b73c3ccdca95c237750c981054997c71d33e09d7 Mon Sep 17 00:00:00 2001 +From: Thomas Bogendoerfer +Date: Fri, 28 Feb 2025 15:37:02 +0100 +Subject: MIPS: cm: Fix warning if MIPS_CM is disabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Bogendoerfer + +commit b73c3ccdca95c237750c981054997c71d33e09d7 upstream. + +Commit e27fbe16af5c ("MIPS: cm: Detect CM quirks from device tree") +introduced + +arch/mips/include/asm/mips-cm.h:119:13: error: ‘mips_cm_update_property’ + defined but not used [-Werror=unused-function] + +Fix this by making empty function implementation inline + +Fixes: e27fbe16af5c ("MIPS: cm: Detect CM quirks from device tree") +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/mips-cm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/mips-cm.h ++++ b/arch/mips/include/asm/mips-cm.h +@@ -104,7 +104,7 @@ static inline bool mips_cm_present(void) + #ifdef CONFIG_MIPS_CM + extern void mips_cm_update_property(void); + #else +-static void mips_cm_update_property(void) {} ++static inline void mips_cm_update_property(void) {} + #endif + + /** diff --git a/queue-5.4/series b/queue-5.4/series index fb64dbdd71..a8a029274a 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -176,3 +176,4 @@ md-raid1-add-check-for-missing-source-disk-in-proces.patch s390-virtio_ccw-don-t-allocate-assign-airqs-for-non-existing-queues.patch comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch +mips-cm-fix-warning-if-mips_cm-is-disabled.patch