summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-09-25 16:53:15 +0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 17:45:29 +0400
commit0eccc783d85f5edd28497c1f1a62faba392b04eb (patch)
tree62ca191b4a1461d4885533c252e40b8c4cdbb9e8 /arch/s390
parentf7ed68a47fa8da76c0e92ae72e0a1a04dbb4566d (diff)
downloadlinux-0eccc783d85f5edd28497c1f1a62faba392b04eb.tar.xz
s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL
We can have either shared kernel or jump label support, but not both. If a kernel gets IPL'ed from an NSS it's not possible to patch the text segment, since it's read-only. Therefore any static branches cannot be updated. So we need to make sure that shared kernel support is disabled if jump label support is enabled. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index e601340f277a..95303f6a6f53 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -545,8 +545,8 @@ config PFAULT
this option.
config SHARED_KERNEL
- def_bool y
- prompt "VM shared kernel support"
+ bool "VM shared kernel support"
+ depends on !JUMP_LABEL
help
Select this option, if you want to share the text segment of the
Linux kernel between different VM guests. This reduces memory