---

yaml --- r: 233800 b: refs/heads/master c: 60cba5a h: refs/heads/master v: v3
git-mirror · Mar 2, 2011 · 11e95e1 · 11e95e1
1 parent e74da18
commit 11e95e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aaccf7fa2a2f148db1edbe7b09e3119c3f910cf
+refs/heads/master: 60cba5a57b8affe98ea9f2bac147be0fb253d5f4
diff --git a/trunk/arch/x86/platform/olpc/olpc_dt.c b/trunk/arch/x86/platform/olpc/olpc_dt.c
@@ -140,8 +140,7 @@ void * __init prom_early_alloc(unsigned long size)
 		 * wasted bootmem) and hand off chunks of it to callers.
 		 */
 		res = alloc_bootmem(chunk_size);
-		if (!res)
-			return NULL;
+		BUG_ON(!res);
 		prom_early_allocated += chunk_size;
 		memset(res, 0, chunk_size);
 		free_mem = chunk_size;