[PATCH v2] memblock: fix memblock_phys_alloc() section mismatch error

[PATCH v2] memblock: fix memblock_phys_alloc() section mismatch error

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

Fix modpost Section mismatch error in memblock_phys_alloc()

[...]
WARNING: modpost: vmlinux.o(.text.unlikely+0x1dcc): Section mismatch in reference
from the function memblock_phys_alloc() to the function .init.text:memblock_phys_alloc_range()
The function memblock_phys_alloc() references
the function __init memblock_phys_alloc_range().
This is often because memblock_phys_alloc lacks a __init
annotation or the annotation of memblock_phys_alloc_range is wrong.

ERROR: modpost: Section mismatches detected.
Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
[...]

I have checked that the memblock_phys_alloc used in the source tree is all in
the __init section, we should make it as always inline.

Reported-by: k2ci <kernel-bot@kylinos.cn>
Suggested-by: Mike Rapoport <rppt@kernel.org>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 include/linux/memblock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 8adcf1fa8096..9dc7cb239d21 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -405,8 +405,8 @@ phys_addr_t memblock_alloc_range_nid(phys_addr_t size,
 				      phys_addr_t end, int nid, bool exact_nid);
 phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
 
-static inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
-					      phys_addr_t align)
+static __always_inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
+						       phys_addr_t align)
 {
 	return memblock_phys_alloc_range(size, align, 0,
 					 MEMBLOCK_ALLOC_ACCESSIBLE);
-- 
2.25.1

Re: [PATCH v2] memblock: fix memblock_phys_alloc() section mismatch error

[Mike Rapoport]

From: Mike Rapoport <rppt@linux.ibm.com>

On Fri, 17 Dec 2021 10:07:54 +0800, Jackie Liu wrote:
> From: Jackie Liu <liuyun01@kylinos.cn>
> 
> Fix modpost Section mismatch error in memblock_phys_alloc()
> 
> [...]
> WARNING: modpost: vmlinux.o(.text.unlikely+0x1dcc): Section mismatch in reference
> from the function memblock_phys_alloc() to the function .init.text:memblock_phys_alloc_range()
> The function memblock_phys_alloc() references
> the function __init memblock_phys_alloc_range().
> This is often because memblock_phys_alloc lacks a __init
> annotation or the annotation of memblock_phys_alloc_range is wrong.
> 
> [...]

Applied, thanks!

[1/1] memblock: fix memblock_phys_alloc() section mismatch error
      (no commit info)

Best regards,
-- 
Mike Rapoport <rppt@linux.ibm.com>