]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
dyn_array: remove one panic
authorYinghai Lu <yhlu.kernel@gmail.com>
Sat, 6 Sep 2008 17:26:50 +0000 (10:26 -0700)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Oct 2008 14:53:08 +0000 (16:53 +0200)
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>
init/dyn_array.c

index cf1e04c83b33b9ae2054d40209e56860888181d2..778d9d50815850cbfe7bb65f25edd95359963fe1 100644 (file)
@@ -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;