diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-22 20:39:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-22 20:39:53 +0100 |
| commit | bc491fb12513e79702c6f936c838f792b5389129 (patch) | |
| tree | 06b0d5820c553493a22064d5443f541959541963 /include | |
| parent | Merge tag 'for-5.16/parisc-7' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | memblock: fix memblock_phys_alloc() section mismatch error (diff) | |
| download | linux-bc491fb12513e79702c6f936c838f792b5389129.tar.xz linux-bc491fb12513e79702c6f936c838f792b5389129.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memblock.h | 4 |
1 files 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); |