summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2011-11-14 11:19:05 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-11-14 11:19:09 +0100
commit3f25dc4fcbc371f86a61a6af759003ebd4965908 (patch)
tree1fa13e1a9d02b732be71c445963edf9b78a0829f /drivers/s390
parentbc615deaf35ab06e7fe5672b0efb3c7a0b2dcf1a (diff)
downloadop-kernel-dev-3f25dc4fcbc371f86a61a6af759003ebd4965908.zip
op-kernel-dev-3f25dc4fcbc371f86a61a6af759003ebd4965908.tar.gz
[S390] zfcpdump: Do not initialize zfcpdump in kdump mode
When the kernel is started in kdump mode, zfcpdump should not be initialized because both dump methods can't be used at the same time. Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/char/zcore.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 43068fb..1b6d924 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -641,6 +641,8 @@ static int __init zcore_init(void)
if (ipl_info.type != IPL_TYPE_FCP_DUMP)
return -ENODATA;
+ if (OLDMEM_BASE)
+ return -ENODATA;
zcore_dbf = debug_register("zcore", 4, 1, 4 * sizeof(long));
debug_register_view(zcore_dbf, &debug_sprintf_view);
OpenPOWER on IntegriCloud