[PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

Fix modpost Section mismatch error in next_platform_timer().

  [...]
  WARNING: modpost: vmlinux.o(.text.unlikely+0x26e60): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
  The function next_platform_timer() references
  the variable __initdata acpi_gtdt_desc.
  This is often because next_platform_timer lacks a __initdata
  annotation or the annotation of acpi_gtdt_desc is wrong.

  WARNING: modpost: vmlinux.o(.text.unlikely+0x26e64): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
  The function next_platform_timer() references
  the variable __initdata acpi_gtdt_desc.
  This is often because next_platform_timer lacks a __initdata
  annotation or the annotation of acpi_gtdt_desc is wrong.

  ERROR: modpost: Section mismatches detected.
  Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
  make[1]: *** [scripts/Makefile.modpost:59: vmlinux.symvers] Error 1
  make[1]: *** Deleting file 'vmlinux.symvers'
  make: *** [Makefile:1176: vmlinux] Error 2
  [...]

Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver")
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/acpi/arm64/gtdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
index 0a0a982f9c28..c0e77c1c8e09 100644
--- a/drivers/acpi/arm64/gtdt.c
+++ b/drivers/acpi/arm64/gtdt.c
@@ -36,7 +36,7 @@ struct acpi_gtdt_descriptor {
 
 static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata;
 
-static inline void *next_platform_timer(void *platform_timer)
+static inline __init void *next_platform_timer(void *platform_timer)
 {
 	struct acpi_gtdt_header *gh = platform_timer;
 
-- 
2.25.1

Re: [PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[Hanjun Guo]

On 2021/8/23 17:25, Jackie Liu wrote:
> From: Jackie Liu <liuyun01@kylinos.cn>
> 
> Fix modpost Section mismatch error in next_platform_timer().
> 
>    [...]
>    WARNING: modpost: vmlinux.o(.text.unlikely+0x26e60): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
>    The function next_platform_timer() references
>    the variable __initdata acpi_gtdt_desc.
>    This is often because next_platform_timer lacks a __initdata
>    annotation or the annotation of acpi_gtdt_desc is wrong.
> 
>    WARNING: modpost: vmlinux.o(.text.unlikely+0x26e64): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
>    The function next_platform_timer() references
>    the variable __initdata acpi_gtdt_desc.
>    This is often because next_platform_timer lacks a __initdata
>    annotation or the annotation of acpi_gtdt_desc is wrong.
> 
>    ERROR: modpost: Section mismatches detected.
>    Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
>    make[1]: *** [scripts/Makefile.modpost:59: vmlinux.symvers] Error 1
>    make[1]: *** Deleting file 'vmlinux.symvers'
>    make: *** [Makefile:1176: vmlinux] Error 2
>    [...]
> 
> Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver")
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
> ---
>   drivers/acpi/arm64/gtdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> index 0a0a982f9c28..c0e77c1c8e09 100644
> --- a/drivers/acpi/arm64/gtdt.c
> +++ b/drivers/acpi/arm64/gtdt.c
> @@ -36,7 +36,7 @@ struct acpi_gtdt_descriptor {
>   
>   static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata;
>   
> -static inline void *next_platform_timer(void *platform_timer)
> +static inline __init void *next_platform_timer(void *platform_timer)
>   {
>   	struct acpi_gtdt_header *gh = platform_timer;

Looks good to me,

Acked-by: Hanjun Guo <guohanjun@huawei.com>

Thanks
Hanjun

Re: [PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[Jackie Liu]

Friendly ping...



August 23, 2021 9:33 PM, "Hanjun Guo" <guohanjun@huawei.com> 写到:

> On 2021/8/23 17:25, Jackie Liu wrote:
> 
>> From: Jackie Liu <liuyun01@kylinos.cn>
>> Fix modpost Section mismatch error in next_platform_timer().
>> [...]
>> WARNING: modpost: vmlinux.o(.text.unlikely+0x26e60): Section mismatch in reference from the
>> function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
>> The function next_platform_timer() references
>> the variable __initdata acpi_gtdt_desc.
>> This is often because next_platform_timer lacks a __initdata
>> annotation or the annotation of acpi_gtdt_desc is wrong.
>> WARNING: modpost: vmlinux.o(.text.unlikely+0x26e64): Section mismatch in reference from the
>> function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
>> The function next_platform_timer() references
>> the variable __initdata acpi_gtdt_desc.
>> This is often because next_platform_timer lacks a __initdata
>> annotation or the annotation of acpi_gtdt_desc is wrong.
>> ERROR: modpost: Section mismatches detected.
>> Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
>> make[1]: *** [scripts/Makefile.modpost:59: vmlinux.symvers] Error 1
>> make[1]: *** Deleting file 'vmlinux.symvers'
>> make: *** [Makefile:1176: vmlinux] Error 2
>> [...]
>> Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver")
>> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
>> ---
>> drivers/acpi/arm64/gtdt.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
>> index 0a0a982f9c28..c0e77c1c8e09 100644
>> --- a/drivers/acpi/arm64/gtdt.c
>> +++ b/drivers/acpi/arm64/gtdt.c
>> @@ -36,7 +36,7 @@ struct acpi_gtdt_descriptor {
>>> static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata;
>>> -static inline void *next_platform_timer(void *platform_timer)
>> +static inline __init void *next_platform_timer(void *platform_timer)
>> {
>> struct acpi_gtdt_header *gh = platform_timer;
> 
> Looks good to me,
> 
> Acked-by: Hanjun Guo <guohanjun@huawei.com>
> 
> Thanks
> Hanjun

Re: [PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[Hanjun Guo]

On 2021/8/31 18:11, Jackie Liu wrote:
> Friendly ping...

Lorenzo, would you mind take this patch?

Thanks
Hanjun

Re: [PATCH] acpi/arm64: fix next_platform_timer() section mismatch error

[Catalin Marinas]

On Mon, 23 Aug 2021 17:25:26 +0800, Jackie Liu wrote:
> Fix modpost Section mismatch error in next_platform_timer().
> 
>   [...]
>   WARNING: modpost: vmlinux.o(.text.unlikely+0x26e60): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc
>   The function next_platform_timer() references
>   the variable __initdata acpi_gtdt_desc.
>   This is often because next_platform_timer lacks a __initdata
>   annotation or the annotation of acpi_gtdt_desc is wrong.
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] acpi/arm64: fix next_platform_timer() section mismatch error
      https://git.kernel.org/arm64/c/596143e3aec3

-- 
Catalin