summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongjie Yang <hongjie@us.ibm.com>2008-03-05 12:37:16 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-03-05 12:37:20 +0100
commit583b33bc83d24791f11e862290ee0b79d804d2d8 (patch)
tree1d064b21e898e999e16aadbc1f24f72385cec4f1
parent208e559155c775ba63e9f6fe59ac6d1e15711d28 (diff)
[S390] incorrect reipl nss name.
/sys/firmware/reipl/nss/name contains the nss name when defsys or savesys command has been executed. If the defsys or savesys command fails the kernel_nss_name has to be cleared since a reipl on that nss name won't be possible. Signed-off-by: Hongjie Yang <hongjie@us.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/early.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 9f7b73b180f0..01832c440636 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -88,13 +88,17 @@ static noinline __init void create_kernel_nss(void)
__cpcmd(defsys_cmd, NULL, 0, &response);
- if (response != 0)
+ if (response != 0) {
+ kernel_nss_name[0] = '\0';
return;
+ }
__cpcmd(savesys_cmd, NULL, 0, &response);
- if (response != strlen(savesys_cmd))
+ if (response != strlen(savesys_cmd)) {
+ kernel_nss_name[0] = '\0';
return;
+ }
ipl_flags = IPL_NSS_VALID;
}