Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[safe/jmp/linux-2.6] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index a092dc7..acda512 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -3,12 +3,11 @@
 #
 
 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
          OProfile is a profiling system capable of profiling the
          whole system, include the kernel, kernel modules, libraries,
@@ -16,17 +15,15 @@ config OPROFILE
 
          If unsure, say N.
 
-config OPROFILE_IBS
-       bool "OProfile AMD IBS support (EXPERIMENTAL)"
+config OPROFILE_EVENT_MULTIPLEX
+       bool "OProfile multiplexing support (EXPERIMENTAL)"
        default n
-       depends on OPROFILE && SMP && X86
+       depends on OPROFILE && 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.
+         The number of hardware counters is limited. The multiplexing
+         feature enables OProfile to gather more events than counters
+         are provided by the hardware. This is realized by switching
+         between events at an user specified time interval.
 
          If unsure, say N.
 
@@ -44,6 +41,12 @@ config KPROBES
          for kernel debugging, non-intrusive instrumentation and testing.
          If in doubt, say "N".
 
+config OPTPROBES
+       def_bool y
+       depends on KPROBES && HAVE_OPTPROBES
+       depends on !PREEMPT
+       select KALLSYMS_ALL
+
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
        bool
        help
@@ -70,6 +73,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
 
@@ -79,6 +89,8 @@ config HAVE_KPROBES
 config HAVE_KRETPROBES
        bool
 
+config HAVE_OPTPROBES
+       bool
 #
 # An arch should select this if it provides all these things:
 #
@@ -101,9 +113,42 @@ 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
          The <linux/clk.h> calls support software clock gating and
          thus are a key power management tool on many systems.
 
+config HAVE_DMA_API_DEBUG
+       bool
+
+config HAVE_DEFAULT_NO_SPIN_MUTEXES
+       bool
+
+config HAVE_HW_BREAKPOINT
+       bool
+       depends on PERF_EVENTS
+
+config HAVE_MIXED_BREAKPOINTS_REGS
+       bool
+       depends on HAVE_HW_BREAKPOINT
+       help
+         Depending on the arch implementation of hardware breakpoints,
+         some of them have separate registers for data and instruction
+         breakpoints addresses, others have mixed registers to store
+         them but define the access type in a control register.
+         Select this option if your arch implements breakpoints under the
+         latter fashion.
+
+config HAVE_USER_RETURN_NOTIFIER
+       bool
+
+source "kernel/gcov/Kconfig"