memblock: 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEeOVYVaWZL5900a/pOQOGJssO/ZEFAmHDZCMTHHJwcHRAbGlu
 dXguaWJtLmNvbQAKCRA5A4Ymyw79kSOpCACxKqKuiKf/AY1ckeSV7Y+zBWQrbPVj
 UoQ459RqhbkEAQYdFLW10T2PiNC7zVxgsNUBafy+8OAh/TSIXDH+pvfk1TbWZBFb
 G+Of0FASwiEmjir41HEie41MT6emtmjiWFlGBLFCBrA2nbZj4doC3UCV0F0TpN6I
 pq1sczkEeYT9Bu51t+qStW4zj6ICLvxAFlsB26jVFrUfv6Tg4r4JmCLrDzrgwjh7
 pRUzghOq4poSIUO1HH/LGQvNkzyEtx47yi80Jp3nHRU2XjdPf7uRMTOhdplx56cm
 I57h35u1BmuxS0Zm7fBxMlc0ima44eG4eWJcQlBLAAdnVRvQr3l/vW+R
 =7qHX
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-12-22 11:39:53 -08:00
commit bc491fb125

View File

@ -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);