From: Joonsoo Kim <js1304@gmail.com>
Date: Thu, 29 Nov 2012 03:17:30 +0000 (+1100)
Subject: bootmem: remove not implemented function call, bootmem_arch_preferred_node()
X-Git-Tag: next-20121205~1^2~287
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d5688b72d4417600d5eb9ffc29d1ac3aacad8f31;p=karo-tx-linux.git

bootmem: remove not implemented function call, bootmem_arch_preferred_node()

There is no implementation of bootmem_arch_preferred_node() and a call to
this function will cause a compilation error.  So remove it.

Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/bootmem.c b/mm/bootmem.c
index f468185b3b28..4af865d7dca6 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -581,19 +581,6 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata,
 {
 	if (WARN_ON_ONCE(slab_is_available()))
 		return kzalloc(size, GFP_NOWAIT);
-
-#ifdef CONFIG_HAVE_ARCH_BOOTMEM
-	{
-		bootmem_data_t *p_bdata;
-
-		p_bdata = bootmem_arch_preferred_node(bdata, size, align,
-							goal, limit);
-		if (p_bdata)
-			return alloc_bootmem_bdata(p_bdata, size, align,
-							goal, limit);
-	}
-#endif
-	return NULL;
 }
 
 static void * __init alloc_bootmem_core(unsigned long size,