mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
memblock: don't mark memblock_phys_mem_size() as __init
At the moment memblock_phys_mem_size() is marked as __init, and so is discarded after boot. This is different from most of the memblock functions which are marked __init_memblock, and are only discarded after boot if memory hotplug is not configured. To allow for upcoming code which will need memblock_phys_mem_size() in the hotplug path, change it from __init to __init_memblock. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d7ce369243
commit
1f1ffb8a15
|
@ -1448,7 +1448,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
|
|||
* Remaining API functions
|
||||
*/
|
||||
|
||||
phys_addr_t __init memblock_phys_mem_size(void)
|
||||
phys_addr_t __init_memblock memblock_phys_mem_size(void)
|
||||
{
|
||||
return memblock.memory.total_size;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue