aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-24 20:06:31 -0800
committerGrant Likely <grant.likely@secretlab.ca>2011-03-02 13:45:18 -0700
commit60cba5a57b8affe98ea9f2bac147be0fb253d5f4 (patch)
tree3b9e510153eb922fe479b9e243cf15607604d84b /arch/x86
parent8aaccf7fa2a2f148db1edbe7b09e3119c3f910cf (diff)
downloadlinux-2.6.38-lt-ux500-60cba5a57b8affe98ea9f2bac147be0fb253d5f4.tar.gz
x86: OLPC: have prom_early_alloc BUG rather than return NULL
..similar to what sparc's prom_early_alloc does. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/platform/olpc/olpc_dt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index dab87464753..044bda5b317 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/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;