Subject: [folded-merged] mm-nobootmem-free_all_bootmem-again-fix.patch removed from -mm tree To: phacht@xxxxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,robinmholt@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 23 Jan 2014 15:20:19 -0800 The patch titled Subject: mm-nobootmem-free_all_bootmem-again-fix has been removed from the -mm tree. Its filename was mm-nobootmem-free_all_bootmem-again-fix.patch This patch was dropped because it was folded into mm-nobootmem-free_all_bootmem-again.patch ------------------------------------------------------ From: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx> Subject: mm-nobootmem-free_all_bootmem-again-fix This fixes an unused variable warning in nobootmem.c Signed-off-by: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx> Cc: Robin Holt <robinmholt@xxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/nobootmem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix mm/nobootmem.c --- a/mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix +++ a/mm/nobootmem.c @@ -116,9 +116,13 @@ static unsigned long __init __free_memor static unsigned long __init free_low_memory_core_early(void) { unsigned long count = 0; - phys_addr_t start, end, size; + phys_addr_t start, end; u64 i; +#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK + phys_addr_t size; +#endif + for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL) count += __free_memory_core(start, end); _ Patches currently in -mm which might be from phacht@xxxxxxxxxxxxxxxxxx are mm-nobootmemc-add-return-value-check-in-__alloc_memory_core_early.patch mm-free-memblockmemory-in-free_all_bootmem.patch mm-nobootmem-free_all_bootmem-again.patch mm-nobootmem-free_all_bootmem-again-fix-fix.patch -- 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