Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 43abf3c..684eb5a 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -30,8 +30,9 @@ config OPROFILE_EVENT_MULTIPLEX
 config HAVE_OPROFILE
        bool
 
-config HAVE_HWSAMPLER
-       bool
+config OPROFILE_NMI_TIMER
+       def_bool y
+       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
 
 config KPROBES
        bool "Kprobes"
@@ -46,18 +47,29 @@ config KPROBES
          If in doubt, say "N".
 
 config JUMP_LABEL
-       bool "Optimize trace point call sites"
+       bool "Optimize very unlikely/likely branches"
        depends on HAVE_ARCH_JUMP_LABEL
        help
+         This option enables a transparent branch optimization that
+        makes certain almost-always-true or almost-always-false branch
+        conditions even cheaper to execute within the kernel.
+
+        Certain performance-sensitive kernel code, such as trace points,
+        scheduler functionality, networking code and KVM have such
+        branches and include support for this optimization technique.
+
          If it is detected that the compiler has support for "asm goto",
-        the kernel will compile trace point locations with just a
-        nop instruction. When trace points are enabled, the nop will
-        be converted to a jump to the trace function. This technique
-        lowers overhead and stress on the branch prediction of the
-        processor.
+        the kernel will compile such branches with just a nop
+        instruction. When the condition flag is toggled to true, the
+        nop will be converted to a jump instruction to execute the
+        conditional block of instructions.
+
+        This technique lowers overhead and stress on the branch prediction
+        of the processor and generally makes the kernel faster. The update
+        of the condition is slower, but those are always very rare.
 
-        On i386, options added to the compiler flags may increase
-        the size of the kernel slightly.
+        ( On 32-bit x86, the necessary options added to the compiler
+          flags may increase the size of the kernel slightly. )
 
 config OPTPROBES
        def_bool y
@@ -108,6 +120,9 @@ config HAVE_KRETPROBES
 
 config HAVE_OPTPROBES
        bool
+
+config HAVE_NMI_WATCHDOG
+       bool
 #
 # An arch should select this if it provides all these things:
 #
@@ -147,9 +162,6 @@ config HAVE_CLK
 config HAVE_DMA_API_DEBUG
        bool
 
-config HAVE_DEFAULT_NO_SPIN_MUTEXES
-       bool
-
 config HAVE_HW_BREAKPOINT
        bool
        depends on PERF_EVENTS
@@ -181,4 +193,27 @@ config HAVE_ARCH_JUMP_LABEL
 config HAVE_ARCH_MUTEX_CPU_RELAX
        bool
 
+config HAVE_RCU_TABLE_FREE
+       bool
+
+config ARCH_HAVE_NMI_SAFE_CMPXCHG
+       bool
+
+config HAVE_ALIGNED_STRUCT_PAGE
+       bool
+       help
+         This makes sure that struct pages are double word aligned and that
+         e.g. the SLUB allocator can perform double word atomic operations
+         on a struct page for better performance. However selecting this
+         might increase the size of a struct page by a word.
+
+config HAVE_CMPXCHG_LOCAL
+       bool
+
+config HAVE_CMPXCHG_DOUBLE
+       bool
+
+config ARCH_WANT_OLD_COMPAT_IPC
+       bool
+
 source "kernel/gcov/Kconfig"