mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock
This commit is contained in:
commit
45aa0663cc
75 changed files with 1032 additions and 1747 deletions
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue