Skip to content

Commit bc491fb

Browse files
committed
Merge tag 'fixes-2021-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock fix from Mike Rapoport: "Fix memblock_phys_alloc() section mismatch error There are section mismatch errors when compiler refuses to inline one-line wrapper memblock_phys_alloc(). Make memblock_phys_alloc() __always_inline to avoid these mismatch issues" * tag 'fixes-2021-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: memblock: fix memblock_phys_alloc() section mismatch error
2 parents 3f066e8 + d7f5547 commit bc491fb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/memblock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ phys_addr_t memblock_alloc_range_nid(phys_addr_t size,
405405
phys_addr_t end, int nid, bool exact_nid);
406406
phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
407407

408-
static inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
409-
phys_addr_t align)
408+
static __always_inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
409+
phys_addr_t align)
410410
{
411411
return memblock_phys_alloc_range(size, align, 0,
412412
MEMBLOCK_ALLOC_ACCESSIBLE);

0 commit comments

Comments
 (0)