From 0eccc783d85f5edd28497c1f1a62faba392b04eb Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 25 Sep 2012 14:53:15 +0200 Subject: [PATCH] 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 Signed-off-by: Martin Schwidefsky --- arch/s390/Kconfig | 4 ++-- 1 file 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