From: Michael Holzheu Date: Mon, 4 Dec 2006 14:40:13 +0000 (+0100) Subject: [S390] Use diag instead of ccw reipl. X-Git-Tag: v2.6.20-rc2~6^2~13^2~20^2~23 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5986b0e845bc52a53ff3cafd74d341e81c95658d;p=linux-2.6-omap-h63xx.git [S390] Use diag instead of ccw reipl. Since the diag 308 reipl method is superior to the ccw method, we should use it whenever it is possible. We can do that, if the user has not specified a new reipl ccw device and the system has been ipled from a ccw device. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 60ba1454bfe..ec127826f22 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -664,6 +664,8 @@ void do_reipl(void) switch (reipl_method) { case IPL_METHOD_CCW_CIO: devid.devno = reipl_block_ccw->ipl_info.ccw.devno; + if (ipl_get_type() == IPL_TYPE_CCW && devid.devno == ipl_devno) + diag308(DIAG308_IPL, NULL); devid.ssid = 0; reipl_ccw_dev(&devid); break;