From 3ff4ed253e16b35ba080a3646143f3334107c71a Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 17 Feb 2010 11:29:49 -0800
Subject: [PATCH] --- yaml --- r: 185141 b: refs/heads/master c:
 2ee78f7b1d8ada2615ecbcd9fea70580008bd6ce h: refs/heads/master i:   185139:
 b43c623632be2bf0a70aaf49d521e61781a629c0 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64c4efb28d0a..9330dabd5594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 580e0ad21d6d6f932461d24b47041e3dd499c23f
+refs/heads/master: 2ee78f7b1d8ada2615ecbcd9fea70580008bd6ce
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 78821a28e394..1fa93bd2bb9f 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -3450,6 +3450,7 @@ int __init add_from_early_node_map(struct range *range, int az,
 	return nr_range;
 }
 
+#ifdef CONFIG_NO_BOOTMEM
 void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
 					u64 goal, u64 limit)
 {
@@ -3486,6 +3487,7 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
 
 	return NULL;
 }
+#endif
 
 
 void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data)