From 17125a397a0a2af60180de2aed2d92582fad66d3 Mon Sep 17 00:00:00 2001
From: Michael Holzheu <holzheu@de.ibm.com>
Date: Mon, 22 Oct 2007 12:52:43 +0200
Subject: [PATCH] --- yaml --- r: 72117 b: refs/heads/master c:
 e3d3683d1402c1737687cb698451d545f57c32a7 h: refs/heads/master i:   72115:
 93df6ce96d98731c1aa74c2bf31c31bc9aa3dd5f v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/ipl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9570b9e00f40..96cabb493401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f021ce1957504cacc78896de857b90293badabc
+refs/heads/master: e3d3683d1402c1737687cb698451d545f57c32a7
diff --git a/trunk/arch/s390/kernel/ipl.c b/trunk/arch/s390/kernel/ipl.c
index 66b51901c87d..ce0856d32500 100644
--- a/trunk/arch/s390/kernel/ipl.c
+++ b/trunk/arch/s390/kernel/ipl.c
@@ -648,6 +648,8 @@ static int dump_set_type(enum dump_type type)
 	case DUMP_TYPE_CCW:
 		if (MACHINE_IS_VM)
 			dump_method = DUMP_METHOD_CCW_VM;
+		else if (diag308_set_works)
+			dump_method = DUMP_METHOD_CCW_DIAG;
 		else
 			dump_method = DUMP_METHOD_CCW_CIO;
 		break;