diff options
| author | Heiko Carstens | 2007-03-05 23:35:45 +0100 |
|---|---|---|
| committer | Martin Schwidefsky | 2007-03-05 23:35:45 +0100 |
| commit | 9c9c17613a78545a4a93b1370924f62eb282c903 (patch) | |
| tree | c5b001a52bdf365f386c22c9647a4be05505e9b5 /arch/s390/kernel | |
| parent | [S390] reipl: move dump_prefix_page out of text section. (diff) | |
| download | kernel-qcow2-linux-9c9c17613a78545a4a93b1370924f62eb282c903.tar.gz kernel-qcow2-linux-9c9c17613a78545a4a93b1370924f62eb282c903.tar.xz kernel-qcow2-linux-9c9c17613a78545a4a93b1370924f62eb282c903.zip | |
[S390] nss: disable kexec.
nss and kexec don't work together since kexec wants to write to the
read-only text section of the shared kernel image.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/machine_kexec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index 52f57af252b4..3c77dd36994c 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c @@ -19,6 +19,7 @@ #include <asm/system.h> #include <asm/smp.h> #include <asm/reset.h> +#include <asm/ipl.h> typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long); @@ -29,6 +30,10 @@ int machine_kexec_prepare(struct kimage *image) { void *reboot_code_buffer; + /* Can't replace kernel image since it is read-only. */ + if (ipl_flags & IPL_NSS_VALID) + return -ENOSYS; + /* We don't support anything but the default image type for now. */ if (image->type != KEXEC_TYPE_DEFAULT) return -EINVAL; |