Subject: [folded-merged] mm-nobootmem-free_all_bootmem-again-fix-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,phacht@xxxxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,robinmholt@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 23 Jan 2014 15:20:21 -0800
The patch titled
Subject: mm-nobootmem-free_all_bootmem-again-fix-fix
has been removed from the -mm tree. Its filename was
mm-nobootmem-free_all_bootmem-again-fix-fix.patch
This patch was dropped because it was folded into mm-nobootmem-free_all_bootmem-again.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-nobootmem-free_all_bootmem-again-fix-fix
cleanup
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx>
Cc: Robin Holt <robinmholt@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/nobootmem.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff -puN mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix-fix mm/nobootmem.c
--- a/mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix-fix
+++ a/mm/nobootmem.c
@@ -119,24 +119,23 @@ static unsigned long __init free_low_mem
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);
#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
+ {
+ phys_addr_t size;
- /* Free memblock.reserved array if it was allocated */
- size = get_allocated_memblock_reserved_regions_info(&start);
- if (size)
- count += __free_memory_core(start, start + size);
-
- /* Free memblock.memory array if it was allocated */
- size = get_allocated_memblock_memory_regions_info(&start);
- if (size)
- count += __free_memory_core(start, start + size);
+ /* Free memblock.reserved array if it was allocated */
+ size = get_allocated_memblock_reserved_regions_info(&start);
+ if (size)
+ count += __free_memory_core(start, start + size);
+
+ /* Free memblock.memory array if it was allocated */
+ size = get_allocated_memblock_memory_regions_info(&start);
+ if (size)
+ count += __free_memory_core(start, start + size);
+ }
#endif
return count;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-print-more-details-for-bad_page.patch
mm-munlock-fix-potential-race-with-thp-page-split.patch
mm-dump-page-when-hitting-a-vm_bug_on-using-vm_bug_on_page.patch
memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path.patch
numa-add-a-sysctl-for-numa_balancing.patch
mm-nobootmem-free_all_bootmem-again.patch
mm-improve-documentation-of-page_order-v2-fix.patch
lib-parserc-put-export_symbols-in-the-conventional-place.patch
printk-flush-conflicting-continuation-line-fix.patch
lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix.patch
drivers-rtc-rtc-cmosc-propagate-hpet_register_irq_handler-failure.patch
fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-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
