x86, docbook: Fix errors from x86 headers merger

[pandora-kernel.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 9d055b4..215e460 100644 (file)
--- 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
@@ -121,6 +105,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