diff options
author | Joe Perches <joe@perches.com> | 2009-06-18 19:48:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 19:46:04 -0400 |
commit | 433f13a7274ccc3541d2832ffe5ef4472036cc72 (patch) | |
tree | 3ae071e5bb856de36c78cce612dfba81bee68523 /mm/bootmem.c | |
parent | 1e9c28599879040039f610c5b177e61ef65ff100 (diff) |
bootmem.c: avoid c90 declaration warning
[akpm@linux-foundation.org: cleanup]
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.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 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 282df0a09e6f..d2a9ce952768 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -536,11 +536,15 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata, | |||
536 | return kzalloc(size, GFP_NOWAIT); | 536 | return kzalloc(size, GFP_NOWAIT); |
537 | 537 | ||
538 | #ifdef CONFIG_HAVE_ARCH_BOOTMEM | 538 | #ifdef CONFIG_HAVE_ARCH_BOOTMEM |
539 | bootmem_data_t *p_bdata; | 539 | { |
540 | 540 | bootmem_data_t *p_bdata; | |
541 | p_bdata = bootmem_arch_preferred_node(bdata, size, align, goal, limit); | 541 | |
542 | if (p_bdata) | 542 | p_bdata = bootmem_arch_preferred_node(bdata, size, align, |
543 | return alloc_bootmem_core(p_bdata, size, align, goal, limit); | 543 | goal, limit); |
544 | if (p_bdata) | ||
545 | return alloc_bootmem_core(p_bdata, size, align, | ||
546 | goal, limit); | ||
547 | } | ||
544 | #endif | 548 | #endif |
545 | return NULL; | 549 | return NULL; |
546 | } | 550 | } |