diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:39:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:39:25 +1100 |
| commit | a0b990e393ee7337d8b50f1520854460eeed9a10 (patch) | |
| tree | e7f70281323d165df235ac79a4fd3dd608b40833 /arch | |
| parent | 270d0fe182dba26f90e81429ee5087bbd6a1b897 (diff) | |
| parent | d314429d540b9ff6c9003dd21006d258b0ff5220 (diff) | |
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/platform/olpc/olpc_dt.c | 3 |
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 dab874647530..044bda5b3174 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; |