1 files changed, 36 insertions, 17 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 7f418bbc261a..e5eb1337a537 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -3,11 +3,9 @@
 #
 
 config OPROFILE
-        tristate "OProfile system profiling (EXPERIMENTAL)"
+        tristate "OProfile system profiling"
         depends on PROFILING
         depends on HAVE_OPROFILE
-        depends on TRACING_SUPPORT
-        select TRACING
         select RING_BUFFER
         select RING_BUFFER_ALLOW_SWAP
         help
@@ -17,20 +15,6 @@ config OPROFILE
 
           If unsure, say N.
 
-config OPROFILE_IBS
-        bool "OProfile AMD IBS support (EXPERIMENTAL)"
-        default n
-        depends on OPROFILE && SMP && X86
-        help
-          Instruction-Based Sampling (IBS) is a new profiling
-          technique that provides rich, precise program performance
-          information. IBS is introduced by AMD Family10h processors
-          (AMD Opteron Quad-Core processor "Barcelona") to overcome
-          the limitations of conventional performance counter
-          sampling.
-
-          If unsure, say N.
-
 config OPROFILE_EVENT_MULTIPLEX
         bool "OProfile multiplexing support (EXPERIMENTAL)"
         default n
@@ -57,6 +41,17 @@ config KPROBES
           for kernel debugging, non-intrusive instrumentation and testing.
           If in doubt, say "N".
 
+config OPTPROBES
+        bool "Kprobes jump optimization support (EXPERIMENTAL)"
+        default y
+        depends on KPROBES
+        depends on !PREEMPT
+        depends on HAVE_OPTPROBES
+        select KALLSYMS_ALL
+        help
+          This option will allow kprobes to optimize breakpoint to
+          a jump for reducing its overhead.
+
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
         bool
         help
@@ -83,6 +78,13 @@ config KRETPROBES
         def_bool y
         depends on KPROBES && HAVE_KRETPROBES
 
+config USER_RETURN_NOTIFIER
+        bool
+        depends on HAVE_USER_RETURN_NOTIFIER
+        help
+          Provide a kernel-internal notification when a cpu is about to
+          switch to user mode.
+
 config HAVE_IOREMAP_PROT
         bool
 
@@ -92,6 +94,8 @@ config HAVE_KPROBES
 config HAVE_KRETPROBES
         bool
 
+config HAVE_OPTPROBES
+        bool
 #
 # An arch should select this if it provides all these things:
 #
@@ -114,6 +118,14 @@ config HAVE_DMA_ATTRS
 config USE_GENERIC_SMP_HELPERS
         bool
 
+config HAVE_REGS_AND_STACK_ACCESS_API
+        bool
+        help
+          This symbol should be selected by an architecure if it supports
+          the API needed to access registers and stack entries from pt_regs,
+          declared in asm/ptrace.h
+          For example the kprobes-based event tracer needs this API.
+
 config HAVE_CLK
         bool
         help
@@ -126,4 +138,11 @@ config HAVE_DMA_API_DEBUG
 config HAVE_DEFAULT_NO_SPIN_MUTEXES
         bool
 
+config HAVE_HW_BREAKPOINT
+        bool
+        depends on PERF_EVENTS
+
+config HAVE_USER_RETURN_NOTIFIER
+        bool
+
 source "kernel/gcov/Kconfig"