lkml.org 
[lkml]   [2014]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] mm: use memblock_alloc_range()
Date
Replace memblock_find_in_range() and memblock_reserve() with
memblock_alloc_range().

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: linux-mm@kvack.org
---
mm/memblock.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 6d2f219..4d98d93 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1151,21 +1151,16 @@ static void * __init memblock_virt_alloc_internal(
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;
}
@@ -1178,7 +1173,6 @@ again:
}

done:
- memblock_reserve(alloc, size);
ptr = phys_to_virt(alloc);
memset(ptr, 0, size);

--
1.9.1


\
 
 \ /
  Last update: 2014-08-24 17:01    [W:0.112 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site