From 91d89d19b62a4a71d5a00b8b64a5cfe7da8f60d2 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Date: Mon, 29 Apr 2013 15:08:53 -0700
Subject: [PATCH] --- yaml --- r: 365462 b: refs/heads/master c:
 b476e2951fcf7a25574b7b193944b041687f3ed4 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/mm/nobootmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fe534a850478..34695556f8ae 100644
--- 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
index a31be7a0493b..bdd3fa2fc73b 100644
--- 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.