diff options
author | Dave Airlie <airlied@redhat.com> | 2017-03-23 03:05:13 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-03-23 03:05:13 +0100 |
commit | 65d1086c44791112188f6aebbdc3a27cab3736d3 (patch) | |
tree | f769c133e61c54e34e91aa9ecf1d3504a6eb4fb4 /arch/s390/kernel/ipl.c | |
parent | Merge tag 'drm-misc-next-2017-03-21' of git://anongit.freedesktop.org/git/drm... (diff) | |
parent | Linux 4.11-rc3 (diff) | |
download | linux-65d1086c44791112188f6aebbdc3a27cab3736d3.tar.xz linux-65d1086c44791112188f6aebbdc3a27cab3736d3.zip |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'arch/s390/kernel/ipl.c')
-rw-r--r-- | arch/s390/kernel/ipl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index b67dafb7b7cf..e545ffe5155a 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -564,6 +564,8 @@ static struct kset *ipl_kset; static void __ipl_run(void *unused) { + if (MACHINE_IS_LPAR && ipl_info.type == IPL_TYPE_CCW) + diag308(DIAG308_LOAD_NORMAL_DUMP, NULL); diag308(DIAG308_LOAD_CLEAR, NULL); if (MACHINE_IS_VM) __cpcmd("IPL", NULL, 0, NULL); |