From: Michael Holzheu <holzheu@de.ibm.com>
Date: Wed, 5 Mar 2008 11:37:15 +0000 (+0100)
Subject: [S390] Load disabled wait psw if reipl fails.
X-Git-Tag: v2.6.25-rc5~28^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208e559155c775ba63e9f6fe59ac6d1e15711d28;p=linux-2.6

[S390] Load disabled wait psw if reipl fails.

Normally this should not happen, but it's cleaner to do it that way.

Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 60acdc266d..375232c46c 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -704,6 +704,7 @@ void reipl_run(struct shutdown_trigger *trigger)
 	default:
 		break;
 	}
+	disabled_wait((unsigned long) __builtin_return_address(0));
 }
 
 static void __init reipl_probe(void)