2020-07-23 09:43:26

by Jiri Slaby

Subject: [PATCH] mips: traps, add __init to parity_protection_init

It references __initdata and is called only from an __init function:
trap_init. This avoids section mismatches (which I am seeing with gcc
10).

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Thomas Bogendoerfer <[email protected]>
Cc: [email protected]
---
arch/mips/kernel/traps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f655af68176c..702143ad7b47 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1680,7 +1680,7 @@ __setup("nol2par", nol2parity);
* Some MIPS CPUs can enable/disable for cache parity detection, but do
* it different ways.
*/
-static inline void parity_protection_init(void)
+static inline __init void parity_protection_init(void)
{
#define ERRCTL_PE 0x80000000
#define ERRCTL_L2P 0x00800000
--
2.27.0

2020-07-23 10:02:08

by Sergei Shtylyov

Subject: Re: [PATCH] mips: traps, add __init to parity_protection_init

Hello!

On 23.07.2020 12:42, Jiri Slaby wrote:

> It references __initdata and is called only from an __init function:
> trap_init. This avoids section mismatches (which I am seeing with gcc
> 10).
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Thomas Bogendoerfer <[email protected]>
> Cc: [email protected]
> ---
> arch/mips/kernel/traps.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
> index f655af68176c..702143ad7b47 100644
> --- a/arch/mips/kernel/traps.c
> +++ b/arch/mips/kernel/traps.c
> @@ -1680,7 +1680,7 @@ __setup("nol2par", nol2parity);
> * Some MIPS CPUs can enable/disable for cache parity detection, but do
> * it different ways.
> */
> -static inline void parity_protection_init(void)
> +static inline __init void parity_protection_init(void)

*inline* in a .c file? Perhaps gcc-10 has it out-of-line?

[...]

MBR, Sergei

2020-07-24 11:48:40

by Thomas Bogendoerfer

Subject: Re: [PATCH] mips: traps, add __init to parity_protection_init

On Thu, Jul 23, 2020 at 11:42:35AM +0200, Jiri Slaby wrote:
> It references __initdata and is called only from an __init function:
> trap_init. This avoids section mismatches (which I am seeing with gcc
> 10).
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Thomas Bogendoerfer <[email protected]>
> Cc: [email protected]
> ---
> arch/mips/kernel/traps.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 ]