From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbbAPJfQ (ORCPT ); Fri, 16 Jan 2015 04:35:16 -0500 Received: from cpsmtpb-ews03.kpnxchange.com ([213.75.39.6]:56071 "EHLO cpsmtpb-ews03.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbbAPJfI (ORCPT ); Fri, 16 Jan 2015 04:35:08 -0500 Message-ID: <1421400905.15194.15.camel@x220> Subject: [PATCH] [linux-next] s390: Dump check for CONFIG_ZFCPDUMP From: Paul Bolle To: Martin Schwidefsky , Heiko Carstens Cc: Valentin Rothberg , linux390@de.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 16 Jan 2015 10:35:05 +0100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 16 Jan 2015 09:35:06.0184 (UTC) FILETIME=[B6359480:01D0316F] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 725908110a1f ("s390: add SMT support") added a check for CONFIG_ZFCPDUMP. But the Kconfig symbol ZFCPDUMP was removed in v3.16 through commit bf28a5970de3 ("s390/dump: Remove CONFIG_ZFCPDUMP"). So this check will always evaluate to false. No one noticed probably because the code also checks for CONFIG_CRASH_DUMP which "also enables s390 zfcpdump". Dump the unneeded check. Signed-off-by: Paul Bolle --- This trivial issue popped up in next-20150116. If s390 commits can still be altered after they've hit linux-next this might just as well be folded into commit 725908110a1f ("s390: add SMT support"). Entirely untested! arch/s390/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 370ff3a092a3..fd4a9308f95f 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -762,7 +762,7 @@ static void __init smp_detect_cpus(void) panic("Could not find boot CPU type"); } -#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_CRASH_DUMP) +#if defined(CONFIG_CRASH_DUMP) /* Collect CPU state of previous system */ smp_store_cpu_states(info); #endif -- 1.9.3