diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-06 10:26:50 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:08 +0200 |
| commit | 9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a (patch) | |
| tree | 2f9fdedc89c6c3c5511a50991f1962c51e371e9f | |
| parent | 3c2cbd2490656fb4b6ede586c557a2b09811a432 (diff) | |
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>
| -rw-r--r-- | init/dyn_array.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |