aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJoonsoo Kim <iamjoonsoo.kim@lge.com>2013-04-29 15:08:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 15:54:39 -0700
commitb476e2951fcf7a25574b7b193944b041687f3ed4 (patch)
tree8870e141ca8acbf58cf0b8b470e30b6dbb4a32d2 /mm
parentb4def3509d18c1db9198f92d4c35065e029a09a1 (diff)
downloadlinux-b476e2951fcf7a25574b7b193944b041687f3ed4.tar.gz
mm, nobootmem: do memset() after memblock_reserve()
Currently, we do memset() before reserving the area. This may not cause any problem, but it is somewhat weird. So change execution order. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Yinghai Lu <yinghai@kernel.org> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Jiang Liu <liuj97@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/nobootmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index a31be7a0493..bdd3fa2fc73 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -45,9 +45,9 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
if (!addr)
return NULL;
+ memblock_reserve(addr, size);
ptr = phys_to_virt(addr);
memset(ptr, 0, size);
- memblock_reserve(addr, size);
/*
* The min_count is set to 0 so that bootmem allocated blocks
* are never reported as leaks.