|
@@ -757,14 +757,10 @@ void __init setup_log_buf(int early)
|
|
return;
|
|
return;
|
|
|
|
|
|
if (early) {
|
|
if (early) {
|
|
- unsigned long mem;
|
|
|
|
-
|
|
|
|
- mem = memblock_alloc(new_log_buf_len, PAGE_SIZE);
|
|
|
|
- if (!mem)
|
|
|
|
- return;
|
|
|
|
- new_log_buf = __va(mem);
|
|
|
|
|
|
+ new_log_buf =
|
|
|
|
+ memblock_virt_alloc(new_log_buf_len, PAGE_SIZE);
|
|
} else {
|
|
} else {
|
|
- new_log_buf = alloc_bootmem_nopanic(new_log_buf_len);
|
|
|
|
|
|
+ new_log_buf = memblock_virt_alloc_nopanic(new_log_buf_len, 0);
|
|
}
|
|
}
|
|
|
|
|
|
if (unlikely(!new_log_buf)) {
|
|
if (unlikely(!new_log_buf)) {
|