X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fprintk%2Fprintk.c;h=f8b41bddc6dcd54d31af4625306177c6cb6b22f3;hb=60eaa0190f6b39dce18eb1975d9773ed8bc9a534;hp=be7c86bae5762e4e5283dcbd305951301310c58d;hpb=192b4bcbbe7f226a063c57c82007dbdd31739c54;p=~andy%2Flinux

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index be7c86bae57..f8b41bddc6d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -757,14 +757,10 @@ void __init setup_log_buf(int early)
 		return;
 
 	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 {
-		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)) {