Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b6fa2877b1734aad723805c2e5518fe301f3443d..68d91c8233f42162039af96c8ed1fdd3e1d6a88e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -22,7 +22,6 @@ config X86
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_IOREMAP_PROT
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_IOREMAP_PROT

-       select HAVE_GET_USER_PAGES_FAST

        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_KRETPROBES


@@ -30,6 +29,7 @@ config X86
        select HAVE_FTRACE
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER
        select HAVE_FTRACE
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER

+       select HAVE_GENERIC_DMA_COHERENT if X86_32

        select HAVE_EFFICIENT_UNALIGNED_ACCESS
 
 config ARCH_DEFCONFIG
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
 
 config ARCH_DEFCONFIG


@@ -951,9 +951,9 @@ config NUMA
          local memory controller of the CPU and add some more
          NUMA awareness to the kernel.
 
          local memory controller of the CPU and add some more
          NUMA awareness to the kernel.
 

-         For i386 this is currently highly experimental and should be only
+         For 32-bit this is currently highly experimental and should be only

          used for kernel development. It might also cause boot failures.
          used for kernel development. It might also cause boot failures.

-         For x86_64 this is recommended on all multiprocessor Opteron systems.
+         For 64-bit this is recommended on all multiprocessor Opteron systems.

          If the system is EM64T, you should say N unless your system is
          EM64T NUMA.
 
          If the system is EM64T, you should say N unless your system is
          EM64T NUMA.
 


@@ -1263,7 +1263,7 @@ config KEXEC
          strongly in flux, so no good recommendation can be made.
 
 config CRASH_DUMP
          strongly in flux, so no good recommendation can be made.
 
 config CRASH_DUMP

-       bool "kernel crash dumps (EXPERIMENTAL)"
+       bool "kernel crash dumps"

        depends on X86_64 || (X86_32 && HIGHMEM)
        help
          Generate crash dump after being started by kexec.
        depends on X86_64 || (X86_32 && HIGHMEM)
        help
          Generate crash dump after being started by kexec.