diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 05:01:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 05:01:57 +0100 |
| commit | f7d222ea2ac7aebf1ac06a76e7739ed17480fd38 (patch) | |
| tree | a6de80eed5413b32cf41bcb73d108a8f11253c8e /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mat... (diff) | |
| parent | of/promtree: allow DT device matching by fixing 'name' brokenness (v5) (diff) | |
| download | linux-f7d222ea2ac7aebf1ac06a76e7739ed17480fd38.tar.xz linux-f7d222ea2ac7aebf1ac06a76e7739ed17480fd38.zip | |
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.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; |