[PATCH] dyn_array: remove one panic

From: Yinghai Lu
Date: Sat Sep 06 2008 - 13:27:05 EST


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

Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>

diff --git a/init/dyn_array.c b/init/dyn_array.c
index cf1e04c..778d9d5 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;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/