From 3da3b066dad61e3bea619d8deae2fb1a328f3fc3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 6 Sep 2012 15:19:08 +0200
Subject: [PATCH] --- yaml --- r: 324095 b: refs/heads/master c:
 d978386e79412e45d1aea81eee345dac23d20865 h: refs/heads/master i:   324093:
 38d8f8d1b2fddd87af93934063854201cf68daa0   324091:
 2428afe1cd06a8165a0b2a17de11eb3f75918b4f   324087:
 0c9baeea56ce8d1a43205ec7efb448022fcf9bc7   324079:
 34541db8979676c07beb4f906530fe46be1a5f3c   324063:
 98448bf2f1c474c26c260ddc8c12f029e53406e2   324031:
 5c85cd9b3fede432367f7251f67739c5b2a836a4   323967:
 7438258a8fcb87e6e4d2f0254055510c5a09938c   323839:
 8d2378fceb475f4b8fe070487a5a149709656799   323583:
 375e9e592b0105b5df2a309561edfe803bd6ef7b v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/s390/kernel/machine_kexec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 37980e448428..4c700d56cec9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f6db4d2990d6866ba5d9c699cfc0835b9d8859
+refs/heads/master: d978386e79412e45d1aea81eee345dac23d20865
diff --git a/trunk/arch/s390/kernel/machine_kexec.c b/trunk/arch/s390/kernel/machine_kexec.c
index 0d5063e0ff79..cc913869e015 100644
--- a/trunk/arch/s390/kernel/machine_kexec.c
+++ b/trunk/arch/s390/kernel/machine_kexec.c
@@ -159,7 +159,7 @@ int machine_kexec_prepare(struct kimage *image)
 
 	/* Can't replace kernel image since it is read-only. */
 	if (ipl_flags & IPL_NSS_VALID)
-		return -ENOSYS;
+		return -EOPNOTSUPP;
 
 	if (image->type == KEXEC_TYPE_CRASH)
 		return machine_kexec_prepare_kdump();