git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into x86/memblock
[pandora-kernel.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index
1455a0d
..
baf2aeb
100644
(file)
--- 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 {