The patch titled
Subject: mm: use memblock_alloc_range()
has been added to the -mm tree. Its filename is
mm-use-memblock_alloc_range.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-use-memblock_alloc_range.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-use-memblock_alloc_range.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Subject: mm: use memblock_alloc_range()
Replace memblock_find_in_range() and memblock_reserve() with
the equivalent memblock_alloc_range().
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff -puN mm/memblock.c~mm-use-memblock_alloc_range mm/memblock.c
--- a/mm/memblock.c~mm-use-memblock_alloc_range
+++ a/mm/memblock.c
@@ -1154,21 +1154,16 @@ static void * __init memblock_virt_alloc
if (WARN_ON_ONCE(slab_is_available()))
return kzalloc_node(size, GFP_NOWAIT, nid);
- if (!align)
- align = SMP_CACHE_BYTES;
-
if (max_addr > memblock.current_limit)
max_addr = memblock.current_limit;
again:
- alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
- nid);
+ alloc = memblock_alloc_range_nid(size, align, min_addr, max_addr, nid);
if (alloc)
goto done;
if (nid != NUMA_NO_NODE) {
- alloc = memblock_find_in_range_node(size, align, min_addr,
- max_addr, NUMA_NO_NODE);
+ alloc = memblock_alloc_range(size, align, min_addr, max_addr);
if (alloc)
goto done;
}
@@ -1181,7 +1176,6 @@ again:
}
done:
- memblock_reserve(alloc, size);
ptr = phys_to_virt(alloc);
memset(ptr, 0, size);
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
vfs-make-guard_bh_eod-more-generic.patch
vfs-guard-end-of-device-for-mpage-interface.patch
block_dev-implement-readpages-to-optimize-sequential-read.patch
x86-use-memblock_alloc_range-or-memblock_alloc_base.patch
mm-use-memblock_alloc_range.patch
linux-next.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
