2021-01-05 23:02:35

by Nathan Chancellor

Subject: [PATCH] MIPS: c-r4k: Fix section mismatch for loongson2_sc_init

When building with clang, the following section mismatch warning occurs:

WARNING: modpost: vmlinux.o(.text+0x24490): Section mismatch in
reference from the function r4k_cache_init() to the function
.init.text:loongson2_sc_init()

This should have been fixed with commit ad4fddef5f23 ("mips: fix Section
mismatch in reference") but it was missed. Remove the improper __init
annotation like that commit did.

Fixes: 078a55fc824c ("MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code")
Link: https://github.com/ClangBuiltLinux/linux/issues/787
Signed-off-by: Nathan Chancellor <[email protected]>
---
arch/mips/mm/c-r4k.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 4f976d687ab0..f67297b3175f 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1593,7 +1593,7 @@ static int probe_scache(void)
return 1;
}

-static void __init loongson2_sc_init(void)
+static void loongson2_sc_init(void)
{
struct cpuinfo_mips *c = &current_cpu_data;


base-commit: 36bbbd0e234d817938bdc52121a0f5473b3e58f5
--
2.30.0

2021-01-06 00:50:47

by Huacai Chen

Subject: Re: [PATCH] MIPS: c-r4k: Fix section mismatch for loongson2_sc_init

Reviewed-by: Huacai Chen <[email protected]>

On Wed, Jan 6, 2021 at 7:01 AM Nathan Chancellor
<[email protected]> wrote:
>
> When building with clang, the following section mismatch warning occurs:
>
> WARNING: modpost: vmlinux.o(.text+0x24490): Section mismatch in
> reference from the function r4k_cache_init() to the function
> .init.text:loongson2_sc_init()
>
> This should have been fixed with commit ad4fddef5f23 ("mips: fix Section
> mismatch in reference") but it was missed. Remove the improper __init
> annotation like that commit did.
>
> Fixes: 078a55fc824c ("MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code")
> Link: https://github.com/ClangBuiltLinux/linux/issues/787
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> arch/mips/mm/c-r4k.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
> index 4f976d687ab0..f67297b3175f 100644
> --- a/arch/mips/mm/c-r4k.c
> +++ b/arch/mips/mm/c-r4k.c
> @@ -1593,7 +1593,7 @@ static int probe_scache(void)
> return 1;
> }
>
> -static void __init loongson2_sc_init(void)
> +static void loongson2_sc_init(void)
> {
> struct cpuinfo_mips *c = &current_cpu_data;
>
>
> base-commit: 36bbbd0e234d817938bdc52121a0f5473b3e58f5
> --
> 2.30.0
>

2021-01-07 16:32:10

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: c-r4k: Fix section mismatch for loongson2_sc_init

On Tue, Jan 05, 2021 at 01:34:56PM -0700, Nathan Chancellor wrote:
> When building with clang, the following section mismatch warning occurs:
>
> WARNING: modpost: vmlinux.o(.text+0x24490): Section mismatch in
> reference from the function r4k_cache_init() to the function
> .init.text:loongson2_sc_init()
>
> This should have been fixed with commit ad4fddef5f23 ("mips: fix Section
> mismatch in reference") but it was missed. Remove the improper __init
> annotation like that commit did.
>
> Fixes: 078a55fc824c ("MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code")
> Link: https://github.com/ClangBuiltLinux/linux/issues/787
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> arch/mips/mm/c-r4k.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]