From: Paul Bolle <pebolle@tiscali.nl>
Date: Fri, 16 Jan 2015 09:35:05 +0000 (+0100)
Subject: s390/smp: remove check for CONFIG_ZFCPDUMP
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=032f1be056a2e84f8817b56fe6d76e8e83285578;p=linux-beck.git

s390/smp: remove check for CONFIG_ZFCPDUMP

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 <pebolle@tiscali.nl>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 370ff3a092a3..a668993ff577 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)
+#ifdef CONFIG_CRASH_DUMP
 	/* Collect CPU state of previous system */
 	smp_store_cpu_states(info);
 #endif