aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-06 13:26:50 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:08 -0400
commit9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a (patch)
tree2f9fdedc89c6c3c5511a50991f1962c51e371e9f
parent3c2cbd2490656fb4b6ede586c557a2b09811a432 (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.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)
33 33
34 /* allocate them all together */ 34 /* allocate them all together */
35 max_align = max_t(unsigned long, max_align, PAGE_SIZE); 35 max_align = max_t(unsigned long, max_align, PAGE_SIZE);
36 ptr = __alloc_bootmem_nopanic(total_size, max_align, 0); 36 ptr = __alloc_bootmem(total_size, max_align, 0);
37 if (!ptr)
38 panic("Can not alloc dyn_alloc\n");
39
40 phys = virt_to_phys(ptr); 37 phys = virt_to_phys(ptr);
38
41 for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) { 39 for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) {
42 struct dyn_array *da = *daa; 40 struct dyn_array *da = *daa;
43 41