diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 11:14:26 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 11:14:26 (GMT) |
| commit | 45aa0663cc408617b79a2b53f0a5f50e94688a48 (patch) | |
| tree | 0a53931c317c3c72a3555bd2fbb70a881ee870f2 /kernel/printk.c | |
| parent | 511585a28e5b5fd1cac61e601e42efc4c5dd64b5 (diff) | |
| parent | 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 (diff) | |
| download | linux-45aa0663cc408617b79a2b53f0a5f50e94688a48.tar.xz | |
Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 7982a0a..afc8310c 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -199,7 +199,7 @@ void __init setup_log_buf(int early) unsigned long mem; mem = memblock_alloc(new_log_buf_len, PAGE_SIZE); - if (mem == MEMBLOCK_ERROR) + if (!mem) return; new_log_buf = __va(mem); } else { |