---

yaml --- r: 6218 b: refs/heads/master c: 9592032 h: refs/heads/master v: v3
git-mirror · Aug 29, 2005 · 1c99fba · 1c99fba
1 parent 4b183c2
commit 1c99fba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 145ec7d51ae507c7cc8889ad05e24af05bbd9147
+refs/heads/master: 95920324f51b3a12603cf6d9bacbd831f34c5b60
diff --git a/trunk/arch/ppc64/kernel/prom.c b/trunk/arch/ppc64/kernel/prom.c
@@ -950,8 +950,13 @@ void __init unflatten_device_tree(void)
 	DBG("  size is %lx, allocating...\n", size);
 
 	/* Allocate memory for the expanded device tree */
-	mem = (unsigned long)abs_to_virt(lmb_alloc(size + 4,
-						   __alignof__(struct device_node)));
+	mem = lmb_alloc(size + 4, __alignof__(struct device_node));
+	if (!mem) {
+		DBG("Couldn't allocate memory with lmb_alloc()!\n");
+		panic("Couldn't allocate memory with lmb_alloc()!\n");
+	}
+	mem = (unsigned long)abs_to_virt(mem);
+
 	((u32 *)mem)[size / 4] = 0xdeadbeef;
 
 	DBG("  unflattening...\n", mem);