Commit 5bdba520 authored by Faiyaz Mohammed's avatar Faiyaz Mohammed Committed by Mike Rapoport

mm: memblock: drop __init from memblock functions to make it inline

__init is used with inline due to which memblock wraper functions are
not getting inline.
for example:
[    0.000000] memblock_alloc_try_nid: 1490 bytes align=0x40 nid=-1 from=0x0000000000000000 max_addr=0x0000000000000000 memblock_alloc+0x20/0x2c
[    0.000000] memblock_reserve: [0x000000023f09a3c0-0x000000023f09a991] memblock_alloc_range_nid+0xc0/0x188

Dropping __init from memblock wrapper functions to make it inline and it
increase the debugability.
After:
[    0.000000] memblock_alloc_try_nid: 1490 bytes align=0x40 nid=-1 from=0x0000000000000000 max_addr=0x0000000000000000 start_kernel+0xa4/0x568
[    0.000000] memblock_reserve: [0x000000023f09a3c0-0x000000023f09a991] memblock_alloc_range_nid+0xc0/0x188
Signed-off-by: default avatarFaiyaz Mohammed <faiyazm@codeaurora.org>
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
parent b5cf2d6c
...@@ -404,13 +404,13 @@ void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, ...@@ -404,13 +404,13 @@ void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
phys_addr_t min_addr, phys_addr_t max_addr, phys_addr_t min_addr, phys_addr_t max_addr,
int nid); int nid);
static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align) static __always_inline void *memblock_alloc(phys_addr_t size, phys_addr_t align)
{ {
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE); MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
} }
static inline void * __init memblock_alloc_raw(phys_addr_t size, static inline void *memblock_alloc_raw(phys_addr_t size,
phys_addr_t align) phys_addr_t align)
{ {
return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT, return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
...@@ -418,7 +418,7 @@ static inline void * __init memblock_alloc_raw(phys_addr_t size, ...@@ -418,7 +418,7 @@ static inline void * __init memblock_alloc_raw(phys_addr_t size,
NUMA_NO_NODE); NUMA_NO_NODE);
} }
static inline void * __init memblock_alloc_from(phys_addr_t size, static inline void *memblock_alloc_from(phys_addr_t size,
phys_addr_t align, phys_addr_t align,
phys_addr_t min_addr) phys_addr_t min_addr)
{ {
...@@ -426,33 +426,33 @@ static inline void * __init memblock_alloc_from(phys_addr_t size, ...@@ -426,33 +426,33 @@ static inline void * __init memblock_alloc_from(phys_addr_t size,
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE); MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
} }
static inline void * __init memblock_alloc_low(phys_addr_t size, static inline void *memblock_alloc_low(phys_addr_t size,
phys_addr_t align) phys_addr_t align)
{ {
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE); ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE);
} }
static inline void * __init memblock_alloc_node(phys_addr_t size, static inline void *memblock_alloc_node(phys_addr_t size,
phys_addr_t align, int nid) phys_addr_t align, int nid)
{ {
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
MEMBLOCK_ALLOC_ACCESSIBLE, nid); MEMBLOCK_ALLOC_ACCESSIBLE, nid);
} }
static inline void __init memblock_free_early(phys_addr_t base, static inline void memblock_free_early(phys_addr_t base,
phys_addr_t size) phys_addr_t size)
{ {
memblock_free(base, size); memblock_free(base, size);
} }
static inline void __init memblock_free_early_nid(phys_addr_t base, static inline void memblock_free_early_nid(phys_addr_t base,
phys_addr_t size, int nid) phys_addr_t size, int nid)
{ {
memblock_free(base, size); memblock_free(base, size);
} }
static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size) static inline void memblock_free_late(phys_addr_t base, phys_addr_t size)
{ {
__memblock_free_late(base, size); __memblock_free_late(base, size);
} }
...@@ -460,7 +460,7 @@ static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size) ...@@ -460,7 +460,7 @@ static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
/* /*
* Set the allocation direction to bottom-up or top-down. * Set the allocation direction to bottom-up or top-down.
*/ */
static inline void __init memblock_set_bottom_up(bool enable) static inline void memblock_set_bottom_up(bool enable)
{ {
memblock.bottom_up = enable; memblock.bottom_up = enable;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment