diff --git a/[refs] b/[refs]
index 96c14c1fa731..15bc2883f479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ed68a47fa8da76c0e92ae72e0a1a04dbb4566d
+refs/heads/master: 0eccc783d85f5edd28497c1f1a62faba392b04eb
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index e601340f277a..95303f6a6f53 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/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