From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat, 6 Sep 2008 17:26:50 +0000 (-0700)
Subject: dyn_array: remove one panic
X-Git-Tag: v2.6.28-rc1~80^2~49
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a;p=linux-2.6-omap-h63xx.git

dyn_array: remove one panic

Andrew said, we don't need duplicated panic.
because __alloc_bootmem already have that.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/init/dyn_array.c b/init/dyn_array.c
index cf1e04c83b3..778d9d50815 100644
--- a/init/dyn_array.c
+++ b/init/dyn_array.c
@@ -33,11 +33,9 @@ void __init pre_alloc_dyn_array(void)
 
 	/* allocate them all together */
 	max_align = max_t(unsigned long, max_align, PAGE_SIZE);
-	ptr = __alloc_bootmem_nopanic(total_size, max_align, 0);
-	if (!ptr)
-		panic("Can not alloc dyn_alloc\n");
-
+	ptr = __alloc_bootmem(total_size, max_align, 0);
 	phys = virt_to_phys(ptr);
+
 	for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) {
 		struct dyn_array *da = *daa;