Skip to contentSkip to conversation

mips-fix-r3k_cache_init-build-regression.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Dec 20, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mips: fix r3k_cache_init build regression
has been removed from the -mm tree. Its filename was
mips-fix-r3k_cache_init-build-regression.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: mips: fix r3k_cache_init build regression
Date: Thu, 14 Dec 2023 20:54:47 +0000

My earlier patch removed __weak function declarations that used to be turned into wild branches by the linker, instead causing a link failure when the called functions are unavailable:

mips-linux-ld: arch/mips/mm/cache.o: in function `cpu_cache_init':
cache.c:(.text+0x670): undefined reference to `r3k_cache_init'

The __weak method seems suboptimal, so rather than putting that back, make the function calls conditional on the Kconfig symbol that controls the compilation.

[[email protected]: fix whitespace while we're in there]
Fixes 66445677f01e ("mips: move cache declarations into header")
Cc Jiaxun Yang <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Zi Yan <[email protected]>

---

 arch/mips/mm/cache.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
arch/mips/mm/cache.c renamed from arch/mips/mm/cache.c~mips-fix-r3k_cache_init-build-regression +3 -6
@@ -205,16 +205,13 @@ static inline void setup_protection_map(
 
 void cpu_cache_init(void)
 {
-	if (cpu_has_3k_cache) {
+	if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache)
 		r3k_cache_init();
-	}
-	if (cpu_has_4k_cache) {
+	if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache)
 		r4k_cache_init();
-	}
 
-	if (cpu_has_octeon_cache) {
+	if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache)
 		octeon_cache_init();
-	}
 
 	setup_protection_map();
 }

_

Patches currently in -mm which might be from [email protected] are