summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonsoo Kim <js1304@gmail.com>2012-12-12 13:50:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 17:38:30 -0800
commit2d7a695604556913d9ef1ead47881b804d6c52b4 (patch)
tree05685ea8ebf8c0dd14d1d6ec2d3b72df66c82810
parent9977d9b379cb77e0f67bd6f4563618106e58e11d (diff)
downloadlinux-stable-2d7a695604556913d9ef1ead47881b804d6c52b4.tar.gz
linux-stable-2d7a695604556913d9ef1ead47881b804d6c52b4.tar.bz2
linux-stable-2d7a695604556913d9ef1ead47881b804d6c52b4.zip
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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/bootmem.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index ecc45958ac0c..4730931b45a9 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -581,18 +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;
}