Merge git://git.infradead.org/iommu-2.6

[sfrench/cifs-2.6.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 229cf611d6ffde70d9235660565f557c910c4568..4b34082060914efd6d47b73ff3474cfc7f9a871c 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -34,6 +34,8 @@ config X86
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST

+       select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
+       select HAVE_FTRACE_SYSCALLS

        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK


@@ -1145,7 +1147,7 @@ config NODES_SHIFT
        depends on NEED_MULTIPLE_NODES
        ---help---
          Specify the maximum number of NUMA Nodes available on the target
        depends on NEED_MULTIPLE_NODES
        ---help---
          Specify the maximum number of NUMA Nodes available on the target

-         system.  Increases memory reserved to accomodate various tables.
+         system.  Increases memory reserved to accommodate various tables.

 
 config HAVE_ARCH_BOOTMEM
        def_bool y
 
 config HAVE_ARCH_BOOTMEM
        def_bool y


@@ -1323,7 +1325,7 @@ config MTRR_SANITIZER
          add writeback entries.
 
          Can be disabled with disable_mtrr_cleanup on the kernel command line.
          add writeback entries.
 
          Can be disabled with disable_mtrr_cleanup on the kernel command line.

-         The largest mtrr entry size for a continous block can be set with
+         The largest mtrr entry size for a continuous block can be set with

          mtrr_chunk_size.
 
          If unsure, say Y.
          mtrr_chunk_size.
 
          If unsure, say Y.