Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / arch / s390 / kernel / ipl.c

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 66b51901c87d29be81d8c25cc0b8546ae1e970b1..ce0856d32500215ef1942d03a0a61f000767d4fa 100644 (file)
--- a/arch/s390/kernel/ipl.c
+++ b/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;