From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-x22c.google.com (mail-yh0-x22c.google.com [IPv6:2607:f8b0:4002:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 218EE1A0DF0 for ; Thu, 22 Jan 2015 13:25:48 +1100 (AEDT) Received: by mail-yh0-f44.google.com with SMTP id i57so5950825yha.3 for ; Wed, 21 Jan 2015 18:25:45 -0800 (PST) From: Pranith Kumar To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Mahesh Salgaonkar , Anton Blanchard , Neelesh Gupta , Joel Stanley , Vasant Hegde , Rob Herring , linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 2/2] powerpc/powernv: Skip registering log region when CONFIG_PRINTK=n Date: Wed, 21 Jan 2015 21:26:09 -0500 Message-Id: <1421893570-6920-2-git-send-email-bobby.prani@gmail.com> In-Reply-To: <1421893570-6920-1-git-send-email-bobby.prani@gmail.com> References: <1421893570-6920-1-git-send-email-bobby.prani@gmail.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 CC: Michael Ellerman --- arch/powerpc/platforms/powernv/opal.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index f10b9ec..1db119f0 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) /* Register kernel log buffer */ addr = log_buf_addr_get(); + if (addr == NULL) + return; + size = log_buf_len_get(); + if (size == 0) + return; + rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF, __pa(addr), size); /* Don't warn if this is just an older OPAL that doesn't -- 1.9.1