summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-02 20:01:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-02 20:01:57 -0800
commitf7d222ea2ac7aebf1ac06a76e7739ed17480fd38 (patch)
treea6de80eed5413b32cf41bcb73d108a8f11253c8e /arch
parent7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2 (diff)
parenta74ea43df1afc68f265c0ac2cb64031d855ae97b (diff)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: of/promtree: allow DT device matching by fixing 'name' brokenness (v5) x86: OLPC: have prom_early_alloc BUG rather than return NULL of/flattree: Drop an uninteresting message to pr_debug level of: Add missing of_address.h to xilinx ehci driver
Diffstat (limited to 'arch')
-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 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;