The patch titled
Subject: memblock: don't mark memblock_phys_mem_size() as __init
has been removed from the -mm tree. Its filename was
memblock-dont-mark-memblock_phys_mem_size-as-__init.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/memblock.c~memblock-dont-mark-memblock_phys_mem_size-as-__init mm/memblock.c
--- a/mm/memblock.c~memblock-dont-mark-memblock_phys_mem_size-as-__init
+++ a/mm/memblock.c
@@ -1448,7 +1448,7 @@ void __init __memblock_free_late(phys_ad
* 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;
}
_
Patches currently in -mm which might be from david@xxxxxxxxxxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
