summaryrefslogtreecommitdiffstats
path: root/init/dyn_array.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-06 19:26:50 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:08 +0200
commit9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a (patch)
tree2f9fdedc89c6c3c5511a50991f1962c51e371e9f /init/dyn_array.c
parentx86: io-apic - code style cleaning for setup_IO_APIC_irqs (diff)
downloadlinux-9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a.tar.xz
linux-9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a.zip
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>
Diffstat (limited to '')
-rw-r--r--init/dyn_array.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/init/dyn_array.c b/init/dyn_array.c
index cf1e04c83b33..778d9d508158 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;