Skip to contentSkip to conversation

s390: Dump check for CONFIG_ZFCPDUMP

PATCH Applied Paul Bolle 2 participants 2 messages Jan 16, 2015 – Jan 19, 2015 s390

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 s390: Dump 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.

---
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(-)
arch/s390/kernel/smp.c +1 -1
index 370ff3a092a3..fd4a9308f95f 100644
@@ -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
Signature · 1 line
1.9.3
#1 lore raw
Quoted 10 lines · Paul Bolle

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.

Applied, thanks.