2008-03-05 11:59:54

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 10/10] incorrect reipl nss name.

From: Hongjie Yang <[email protected]>

/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 <[email protected]>
Signed-off-by: Martin Schwidefsky <[email protected]>
---

arch/s390/kernel/early.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

Index: quilt-2.6/arch/s390/kernel/early.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/early.c
+++ quilt-2.6/arch/s390/kernel/early.c
@@ -88,13 +88,17 @@ static noinline __init void create_kerne

__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;
}

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.