public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [linux-next] s390: Dump check for CONFIG_ZFCPDUMP
@ 2015-01-16  9:35 Paul Bolle
  2015-01-19 12:15 ` Heiko Carstens
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Bolle @ 2015-01-16  9:35 UTC (permalink / raw)
  To: Martin Schwidefsky, Heiko Carstens
  Cc: Valentin Rothberg, linux390, linux-s390, linux-kernel

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>
---
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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] [linux-next] s390: Dump check for CONFIG_ZFCPDUMP
  2015-01-16  9:35 [PATCH] [linux-next] s390: Dump check for CONFIG_ZFCPDUMP Paul Bolle
@ 2015-01-19 12:15 ` Heiko Carstens
  0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2015-01-19 12:15 UTC (permalink / raw)
  To: Paul Bolle
  Cc: Martin Schwidefsky, Valentin Rothberg, linux390, linux-s390,
	linux-kernel

On Fri, Jan 16, 2015 at 10:35:05AM +0100, Paul Bolle wrote:
> 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>

Applied, thanks.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-01-19 12:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-16  9:35 [PATCH] [linux-next] s390: Dump check for CONFIG_ZFCPDUMP Paul Bolle
2015-01-19 12:15 ` Heiko Carstens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox