---

yaml --- r: 365462 b: refs/heads/master c: b476e29 h: refs/heads/master v: v3
git-mirror · Apr 29, 2013 · 91d89d1 · 91d89d1
1 parent 545810f
commit 91d89d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4def3509d18c1db9198f92d4c35065e029a09a1
+refs/heads/master: b476e2951fcf7a25574b7b193944b041687f3ed4
diff --git a/trunk/mm/nobootmem.c b/trunk/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.