Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0f4ed71..0d916b2 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -24,6 +24,15 @@ config X86
        bool
        default y
 
        bool
        default y
 

+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       depends on !X86_64_XEN
+       default y
+

 config SEMAPHORE_SLEEPERS
        bool
        default y
 config SEMAPHORE_SLEEPERS
        bool
        default y


@@ -77,6 +86,10 @@ config DMI
        bool
        default y
 
        bool
        default y
 

+config AUDIT_ARCH
+       bool
+       default y
+

 source "init/Kconfig"
 
 
 source "init/Kconfig"
 
 


@@ -324,6 +337,7 @@ config X86_64_ACPI_NUMA
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 

+       select PCI

        select ACPI_NUMA
        default y
        help
        select ACPI_NUMA
        default y
        help


@@ -414,27 +428,47 @@ config HPET_EMULATE_RTC
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y
 
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y
 

-config GART_IOMMU
-       bool "K8 GART IOMMU support"
+# Mark as embedded because too many people got it wrong.
+# The code disables itself when not needed.
+config IOMMU
+       bool "IOMMU support" if EMBEDDED

        default y
        select SWIOTLB
        default y
        select SWIOTLB

+       select AGP

        depends on PCI && !X86_64_XEN
        help
        depends on PCI && !X86_64_XEN
        help

-         Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
-         and for the bounce buffering software IOMMU.
-         Needed to run systems with more than 3GB of memory properly with
-         32-bit PCI devices that do not support DAC (Double Address Cycle).
-         The IOMMU can be turned off at runtime with the iommu=off parameter.
-         Normally the kernel will take the right choice by itself.
-         This option includes a driver for the AMD Opteron/Athlon64 IOMMU
-         northbridge and a software emulation used on other systems without
-         hardware IOMMU.  If unsure, say Y.
-
-# need this always enabled with GART_IOMMU for the VIA workaround
+         Support for full DMA access of devices with 32bit memory access only
+         on systems with more than 3GB. This is usually needed for USB,
+         sound, many IDE/SATA chipsets and some other devices.
+         Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART
+         based IOMMU and a software bounce buffer based IOMMU used on Intel
+         systems and as fallback.
+         The code is only active when needed (enough memory and limited
+         device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
+         too.
+
+config CALGARY_IOMMU
+       bool "IBM Calgary IOMMU support"
+       default y
+       select SWIOTLB
+       depends on PCI && EXPERIMENTAL
+       help
+         Support for hardware IOMMUs in IBM's xSeries x366 and x460
+         systems. Needed to run systems with more than 3GB of memory
+         properly with 32-bit PCI devices that do not support DAC
+         (Double Address Cycle). Calgary also supports bus level
+         isolation, where all DMAs pass through the IOMMU.  This
+         prevents them from going anywhere except their intended
+         destination. This catches hard-to-find kernel bugs and
+         mis-behaving drivers and devices that do not use the DMA-API
+         properly to set up their DMA buffers.  The IOMMU can be
+         turned off at boot time with the iommu=off parameter.
+         Normally the kernel will make the right choice by itself.
+         If unsure, say Y.
+
+# need this always selected by IOMMU for the VIA workaround

 config SWIOTLB
        bool
 config SWIOTLB
        bool

-       default y
-       depends on GART_IOMMU

 
 config X86_MCE
        bool "Machine check support" if EMBEDDED
 
 config X86_MCE
        bool "Machine check support" if EMBEDDED


@@ -468,10 +502,10 @@ config KEXEC
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot

-         but it is indepedent of the system firmware.   And like a reboot
+         but it is independent of the system firmware.   And like a reboot

          you can start any kernel with it, not just Linux.
 
          you can start any kernel with it, not just Linux.
 

-         The name comes from the similiarity to the exec system call.
+         The name comes from the similarity to the exec system call.

 
          It is an ongoing process to be certain the hardware in a machine
          is properly shutdown, so do not be surprised if this code does not
 
          It is an ongoing process to be certain the hardware in a machine
          is properly shutdown, so do not be surprised if this code does not


@@ -531,6 +565,10 @@ config REORDER
          optimal TLB usage. If you have pretty much any version of binutils, 
         this can increase your kernel build time by roughly one minute.
 
          optimal TLB usage. If you have pretty much any version of binutils, 
         this can increase your kernel build time by roughly one minute.
 

+config K8_NB
+       def_bool y
+       depends on AGP_AMD64 || IOMMU || (PCI && NUMA)
+

 endmenu
 
 #
 endmenu
 
 #