diff options
-rw-r--r-- | kernel/printk/printk.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index be7c86bae576..f8b41bddc6dc 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
@@ -757,14 +757,10 @@ void __init setup_log_buf(int early) | |||
757 | return; | 757 | return; |
758 | 758 | ||
759 | if (early) { | 759 | if (early) { |
760 | unsigned long mem; | 760 | new_log_buf = |
761 | 761 | memblock_virt_alloc(new_log_buf_len, PAGE_SIZE); | |
762 | mem = memblock_alloc(new_log_buf_len, PAGE_SIZE); | ||
763 | if (!mem) | ||
764 | return; | ||
765 | new_log_buf = __va(mem); | ||
766 | } else { | 762 | } else { |
767 | new_log_buf = alloc_bootmem_nopanic(new_log_buf_len); | 763 | new_log_buf = memblock_virt_alloc_nopanic(new_log_buf_len, 0); |
768 | } | 764 | } |
769 | 765 | ||
770 | if (unlikely(!new_log_buf)) { | 766 | if (unlikely(!new_log_buf)) { |