From 11e95e13c95bedba31d542027abb4b199d590cb9 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Thu, 24 Feb 2011 20:06:31 -0800
Subject: [PATCH] --- yaml --- r: 233800 b: refs/heads/master c:
 60cba5a57b8affe98ea9f2bac147be0fb253d5f4 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/platform/olpc/olpc_dt.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dfd571d27393..bd776d389b8c 100644
--- 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
index dab874647530..044bda5b3174 100644
--- 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;