Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

Move the instrumentation Kconfig to

arch/Kconfig for architecture dependent options
  - oprofile
  - kprobes

and

init/Kconfig for architecture independent options
  - profiling
  - markers

Remove the "Instrumentation Support" menu. Everything moves to "General setup".
Delete the kernel/Kconfig.instrumentation file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 0 insertions, 55 deletions

diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
deleted file mode 100644
index 2195b6544575..000000000000
--- a/kernel/Kconfig.instrumentation
+++ /dev/null
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
-        bool "Instrumentation Support"
-        default y
-        ---help---
-          Say Y here to get to see options related to performance measurement,
-          system-wide debugging, and testing. This option alone does not add any
-          kernel code.
-
-          If you say N, all options in this submenu will be skipped and
-          disabled. If you're trying to debug the kernel itself, go see the
-          Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-config PROFILING
-        bool "Profiling support (EXPERIMENTAL)"
-        help
-          Say Y here to enable the extended profiling support mechanisms used
-          by profilers such as OProfile.
-
-config OPROFILE
-        tristate "OProfile system profiling (EXPERIMENTAL)"
-        depends on PROFILING && !UML
-        depends on HAVE_OPROFILE
-        help
-          OProfile is a profiling system capable of profiling the
-          whole system, include the kernel, kernel modules, libraries,
-          and applications.
-
-          If unsure, say N.
-
-config HAVE_OPROFILE
-        def_bool n
-
-config KPROBES
-        bool "Kprobes"
-        depends on KALLSYMS && MODULES && !UML
-        depends on HAVE_KPROBES
-        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".
-
-config HAVE_KPROBES
-        def_bool n
-
-config MARKERS
-        bool "Activate markers"
-        help
-          Place an empty function call at each marker site. Can be
-          dynamically changed for a probe function.
-
-endif # INSTRUMENTATION