From b1e5b0fa62432f35a3b0c1c5ee699f001bc431e5 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat, 6 Sep 2008 10:26:50 -0700
Subject: [PATCH] --- yaml --- r: 116508 b: refs/heads/master c:
 9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/init/dyn_array.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 55e19f340d96..d284d3417566 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c2cbd2490656fb4b6ede586c557a2b09811a432
+refs/heads/master: 9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a
diff --git a/trunk/init/dyn_array.c b/trunk/init/dyn_array.c
index cf1e04c83b33..778d9d508158 100644
--- a/trunk/init/dyn_array.c
+++ b/trunk/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;