---

yaml --- r: 185141 b: refs/heads/master c: 2ee78f7 h: refs/heads/master i: 185139: b43c623 v: v3
git-mirror · Feb 22, 2010 · 3ff4ed2 · 3ff4ed2
1 parent 6801ea0
commit 3ff4ed2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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)