[merged] bootmemc-avoid-c90-declaration-warning.patch removed from -mm tree

[merged] bootmemc-avoid-c90-declaration-warning.patch removed from -mm tree

[akpm]

The patch titled
     bootmem.c: avoid c90 declaration warning
has been removed from the -mm tree.  Its filename was
     bootmemc-avoid-c90-declaration-warning.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: bootmem.c: avoid c90 declaration warning
From: Joe Perches <joe@perches.com>

[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>
---

 mm/bootmem.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff -puN mm/bootmem.c~bootmemc-avoid-c90-declaration-warning mm/bootmem.c
--- a/mm/bootmem.c~bootmemc-avoid-c90-declaration-warning
+++ a/mm/bootmem.c
@@ -536,11 +536,15 @@ static void * __init alloc_arch_preferre
 		return kzalloc(size, GFP_NOWAIT);
 
 #ifdef CONFIG_HAVE_ARCH_BOOTMEM
-	bootmem_data_t *p_bdata;
+	{
+		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);
+		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;
 }
_

Patches currently in -mm which might be from joe@perches.com are

origin.patch
linux-next.patch