aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar <bobby.prani@gmail.com>2015-01-21 21:26:09 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-26 22:04:00 -0500
commit6501ab5e380cf25dad85705856bfdde439dbcbd2 (patch)
tree8f070717ef59e97ddfdf0be3234d679d60e27f81
parent3df76a9dcc74d5f012b94ea01ed6e7aaf8362c5a (diff)
powerpc/powernv: Skip registering log region when CONFIG_PRINTK=n
When CONFIG_PRINTK=n, log_buf_addr_get() returns NULL and log_buf_len_get() return 0. Check for these return values and skip registering the dump buffer. Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> Reviewed-by: Stewart Smith <stewart@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/platforms/powernv/opal.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index f10b9ec8c1f5..1db119f0f4ee 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -667,7 +667,13 @@ static void __init opal_dump_region_init(void)
667 667
668 /* Register kernel log buffer */ 668 /* Register kernel log buffer */
669 addr = log_buf_addr_get(); 669 addr = log_buf_addr_get();
670 if (addr == NULL)
671 return;
672
670 size = log_buf_len_get(); 673 size = log_buf_len_get();
674 if (size == 0)
675 return;
676
671 rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF, 677 rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF,
672 __pa(addr), size); 678 __pa(addr), size);
673 /* Don't warn if this is just an older OPAL that doesn't 679 /* Don't warn if this is just an older OPAL that doesn't