X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fs390%2FKconfig;h=6ef54d27fc001720f738aa3f066e15497503c064;hb=48657d223d403af676696d313b421368f5e2208a;hp=b71132166f606343f810e47387c7a26b4918fced;hpb=6d740a438fcb8775008dfd3fc18df7f7a0ca2e12;p=powerpc.git

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b71132166f..6ef54d27fc 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -276,9 +276,6 @@ source "kernel/Kconfig.preempt"
 
 source "mm/Kconfig"
 
-config HOLES_IN_ZONE
-	def_bool y
-
 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING
@@ -513,7 +510,7 @@ config ZFCPDUMP
 	default n
 	help
 	  Select this option if you want to build an zfcpdump enabled kernel.
-	  Refer to "Documentation/s390/zfcpdump.txt" for more details on this.
+	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 
 endmenu
 
@@ -529,21 +526,7 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menu "Instrumentation Support"
-
-source "arch/s390/oprofile/Kconfig"
-
-config KPROBES
-	bool "Kprobes (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && MODULES
-	help
-	  Kprobes allows you to trap at almost any kernel address and
-	  execute a callback function.	register_kprobe() establishes
-	  a probepoint and specifies the callback.  Kprobes is useful
-	  for kernel debugging, non-intrusive instrumentation and testing.
-	  If in doubt, say "N".
-
-endmenu
+source "kernel/Kconfig.instrumentation"
 
 source "arch/s390/Kconfig.debug"