Merge branch 'akpm-current/current'

[deliverable/linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 483197ef613f258838c40ca4e9869bc126e7e9ea..c8dfa430342be77ad35cea98dfad746c36aa26b3 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1438,6 +1438,11 @@ phys_addr_t __init_memblock memblock_phys_mem_size(void)
        return memblock.memory.total_size;
 }
 
+phys_addr_t __init_memblock memblock_reserved_size(void)
+{
+       return memblock.reserved.total_size;
+}
+
 phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
 {
        unsigned long pages = 0;