mips: fix Section mismatch in reference
Subsystems (2)
PATCH 1/1 mips: fix Section mismatch in reference
commit ad4fddef5f2345aa9214e979febe2f47639c10d9 upstream.
When building mips tinyconfig with clang the following error show up:
WARNING: modpost: vmlinux.o(.text+0x1940c): Section mismatch in reference from the function r4k_cache_init() to the function .init.text:loongson3_sc_init() The function r4k_cache_init() references
the function __init loongson3_sc_init().
This is often because r4k_cache_init lacks a __init
annotation or the annotation of loongson3_sc_init is wrong.
Remove marked __init from function loongson3_sc_init(), mips_sc_probe_cm3(), and mips_sc_probe().
--- arch/mips/mm/c-r4k.c | 2 +- arch/mips/mm/sc-mips.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/mm/c-r4k.c +1 -1
@@ -1609,7 +1609,7 @@ static void __init loongson2_sc_init(void) c->options |=MIPS_CPU_INCLUSIVE_CACHES ; } -static void __init loongson3_sc_init (void ) +static void loongson3_sc_init (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config2, lsize;
arch/mips/mm/sc-mips.c +2 -2
@@ -146,7 +146,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)return 1 ; } -static int __init mips_sc_probe_cm3 (void ) +static int mips_sc_probe_cm3 (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned long cfg =read_gcr_l2_config ();
@@ -180,7 +180,7 @@ static int __init mips_sc_probe_cm3(void)return 0 ; } -static inline int __init mips_sc_probe (void ) +static inline int mips_sc_probe (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config1, config2;
Signature · 1 line
2.29.2
PATCH 1/1 mips: lib: uncached: fix non-standard usage of variable 'sp'
commit 5b058973d3205578aa6c9a71392e072a11ca44ef upstream.
When building mips tinyconfig with clang the following warning show up:
arch/mips/lib/uncached.c:45:6: warning: variable 'sp' is uninitialized when used here [-Wuninitialized]
if (sp >= (long)CKSEG0 && sp < (long)CKSEG2)
^~
arch/mips/lib/uncached.c:40:18: note: initialize the variable 'sp' to silence this warning
register long sp __asm__("$sp");
^
= 01 warning generated.
Rework to make an explicit inline move, instead of the non-standard use of specifying registers for local variables. This is what's written from the gcc-10 manual [1] about specifying registers for local variables:
"6.47.5.2 Specifying Registers for Local Variables
.................................................
[...]
"The only supported use for this feature is to specify registers for input and output operands when calling Extended 'asm' (*note Extended Asm::). [...]".
Cc: <[email protected]> # v5.4+
[1] https://docs.w3cub.com/gcc~10/local-register-variables
--- arch/mips/lib/uncached.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/mips/lib/uncached.c +3 -1
@@ -37,10 +37,12 @@*/ unsigned long run_uncached (void *func) { - registerlong sp __asm__("$sp" ); registerlong ret __asm__("$2" );long lfunc = (long )func, ufunc;long usp; +long sp; + + __asm__("move %0, $sp" :"=r" (sp));if (sp >= (long )CKSEG0 && sp < (long )CKSEG2 ) usp =CKSEG1ADDR (sp);
Signature · 1 line
2.29.2