Skip to content

Commit

Permalink
dyn_array: remove one panic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Oct 16, 2008
1 parent 3c2cbd2 commit 9e6cad9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions init/dyn_array.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 9e6cad9

Please sign in to comment.