aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-06-18 16:48:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 16:46:04 -0700
commit433f13a7274ccc3541d2832ffe5ef4472036cc72 (patch)
tree3ae071e5bb856de36c78cce612dfba81bee68523 /mm
parent1e9c28599879040039f610c5b177e61ef65ff100 (diff)
downloadkernel_samsung_espresso10-433f13a7274ccc3541d2832ffe5ef4472036cc72.zip
kernel_samsung_espresso10-433f13a7274ccc3541d2832ffe5ef4472036cc72.tar.gz
kernel_samsung_espresso10-433f13a7274ccc3541d2832ffe5ef4472036cc72.tar.bz2
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')
-rw-r--r--mm/bootmem.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index 282df0a..d2a9ce9 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -536,11 +536,15 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata,
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_core(p_bdata, size, align, goal, limit);
+ {
+ bootmem_data_t *p_bdata;
+
+ p_bdata = bootmem_arch_preferred_node(bdata, size, align,
+ goal, limit);
+ if (p_bdata)
+ return alloc_bootmem_core(p_bdata, size, align,
+ goal, limit);
+ }
#endif
return NULL;
}