Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 433f13a7 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

bootmem.c: avoid c90 declaration warning 



[akpm@linux-foundation.org: cleanup]
Signed-off-by: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1e9c2859

mm/bootmem.c

+9 −5
Original line number Diff line number Diff line
@@ -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);

		p_bdata = bootmem_arch_preferred_node(bdata, size, align,

							goal, limit);

		if (p_bdata)

		return alloc_bootmem_core(p_bdata, size, align, goal, limit);

			return alloc_bootmem_core(p_bdata, size, align,

							goal, limit);

	}

#endif

	return NULL;

}