diff options
| author | Joonsoo Kim <js1304@gmail.com> | 2012-12-12 13:50:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 17:38:31 -0800 |
| commit | 3f7dfe24b84c0ad698c461fc9c4ba3544bbfcebf (patch) | |
| tree | b05abd7ad979dc4060c5e89e4078aa827e7efe82 /mm/bootmem.c | |
| parent | 2d7a695604556913d9ef1ead47881b804d6c52b4 (diff) | |
| download | linux-3f7dfe24b84c0ad698c461fc9c4ba3544bbfcebf.tar.gz linux-3f7dfe24b84c0ad698c461fc9c4ba3544bbfcebf.tar.bz2 linux-3f7dfe24b84c0ad698c461fc9c4ba3544bbfcebf.zip | |
bootmem: remove alloc_arch_preferred_bootmem()
The name of this function is not suitable, and removing the function and
open-coding it into each call sites makes the code more understandable.
Additionally, we shouldn't do an allocation from bootmem when
slab_is_available(), so directly return kmalloc()'s return value.
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>
Diffstat (limited to 'mm/bootmem.c')
| -rw-r--r-- | mm/bootmem.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 4730931b45a9..26d057a8b552 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -575,15 +575,6 @@ find_block: return NULL; } -static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata, - unsigned long size, unsigned long align, - unsigned long goal, unsigned long limit) -{ - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc(size, GFP_NOWAIT); - return NULL; -} - static void * __init alloc_bootmem_core(unsigned long size, unsigned long align, unsigned long goal, @@ -592,9 +583,8 @@ static void * __init alloc_bootmem_core(unsigned long size, bootmem_data_t *bdata; void *region; - region = alloc_arch_preferred_bootmem(NULL, size, align, goal, limit); - if (region) - return region; + if (WARN_ON_ONCE(slab_is_available())) + return kzalloc(size, GFP_NOWAIT); list_for_each_entry(bdata, &bdata_list, list) { if (goal && bdata->node_low_pfn <= PFN_DOWN(goal)) @@ -692,11 +682,9 @@ void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat, { void *ptr; + if (WARN_ON_ONCE(slab_is_available())) + return kzalloc(size, GFP_NOWAIT); again: - ptr = alloc_arch_preferred_bootmem(pgdat->bdata, size, - align, goal, limit); - if (ptr) - return ptr; /* do not panic in alloc_bootmem_bdata() */ if (limit && goal + size > limit) |