linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0d916b2..327ed22 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -24,15 +24,6 @@ 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


@@ -54,10 +45,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
 

-config GENERIC_HWEIGHT
-       bool
-       default y
-

 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 config GENERIC_CALIBRATE_DELAY
        bool
        default y


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

-config AUDIT_ARCH
-       bool
-       default y
-

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


@@ -136,22 +119,6 @@ config GENERIC_CPU
 
 endchoice
 
 
 endchoice
 

-config X86_64_XEN
-       bool "Enable Xen compatible kernel"
-       select SWIOTLB
-       help
-         This option will compile a kernel compatible with Xen hypervisor
-
-config X86_NO_TSS
-       bool
-       depends on X86_64_XEN
-       default y
-
-config X86_NO_IDT
-       bool
-       depends on X86_64_XEN
-       default y
-

 #
 # Define implied options from the CPU selection here
 #
 #
 # Define implied options from the CPU selection here
 #


@@ -165,14 +132,8 @@ config X86_L1_CACHE_SHIFT
        default "7" if GENERIC_CPU || MPSC
        default "6" if MK8
 
        default "7" if GENERIC_CPU || MPSC
        default "6" if MK8
 

-config X86_INTERNODE_CACHE_BYTES
-       int
-       default "4096" if X86_VSMP
-       default X86_L1_CACHE_BYTES if !X86_VSMP
-

 config X86_TSC
        bool
 config X86_TSC
        bool

-       depends on !X86_64_XEN

        default y
 
 config X86_GOOD_APIC
        default y
 
 config X86_GOOD_APIC


@@ -215,7 +176,7 @@ config X86_CPUID
 
 config X86_HT
        bool
 
 config X86_HT
        bool

-       depends on SMP && !MK8 && !X86_64_XEN
+       depends on SMP && !MK8

        default y
 
 config MATH_EMULATION
        default y
 
 config MATH_EMULATION


@@ -229,22 +190,14 @@ config EISA
 
 config X86_IO_APIC
        bool
 
 config X86_IO_APIC
        bool

-       depends !XEN_UNPRIVILEGED_GUEST

        default y
 
        default y
 

-config X86_XEN_GENAPIC
-       bool
-       depends X86_64_XEN
-       default XEN_PRIVILEGED_GUEST || SMP
-

 config X86_LOCAL_APIC
        bool
 config X86_LOCAL_APIC
        bool

-       depends !XEN_UNPRIVILEGED_GUEST

        default y
 
 config MTRR
        bool "MTRR (Memory Type Range Register) support"
        default y
 
 config MTRR
        bool "MTRR (Memory Type Range Register) support"

-       depends on !XEN_UNPRIVILEGED_GUEST

        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control
        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control


@@ -285,7 +238,7 @@ config SMP
 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"

-       depends on SMP && !X86_64_XEN
+       depends on SMP

        default n
        help
          SMT scheduler support improves the CPU scheduler's decision making
        default n
        help
          SMT scheduler support improves the CPU scheduler's decision making


@@ -293,20 +246,11 @@ config SCHED_SMT
          cost of slightly increased overhead in some places. If unsure say
          N here.
 
          cost of slightly increased overhead in some places. If unsure say
          N here.
 

-config SCHED_MC
-       bool "Multi-core scheduler support"
-       depends on SMP && !X86_64_XEN
-       default y
-       help
-         Multi-core scheduler support improves the CPU scheduler's decision
-         making when dealing with multi-core CPU chips at a cost of slightly
-         increased overhead in some places. If unsure say N here.
-

 source "kernel/Kconfig.preempt"
 
 config NUMA
        bool "Non Uniform Memory Access (NUMA) Support"
 source "kernel/Kconfig.preempt"
 
 config NUMA
        bool "Non Uniform Memory Access (NUMA) Support"

-       depends on SMP && !X86_64_XEN
+       depends on SMP

        help
         Enable NUMA (Non Uniform Memory Access) support. The kernel 
         will try to allocate memory used by a CPU on the local memory 
        help
         Enable NUMA (Non Uniform Memory Access) support. The kernel 
         will try to allocate memory used by a CPU on the local memory 


@@ -326,18 +270,12 @@ config K8_NUMA
         Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
         instead, which also takes priority if both are compiled in.   
 
         Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
         instead, which also takes priority if both are compiled in.   
 

-config NODES_SHIFT
-       int
-       default "6"
-       depends on NEED_MULTIPLE_NODES
-

 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
 
 config X86_64_ACPI_NUMA
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 
 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
 
 config X86_64_ACPI_NUMA
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 

-       select PCI

        select ACPI_NUMA
        default y
        help
        select ACPI_NUMA
        default y
        help


@@ -367,7 +305,7 @@ config ARCH_DISCONTIGMEM_DEFAULT
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y

-       depends on (NUMA || EXPERIMENTAL) && !X86_64_XEN
+       depends on (NUMA || EXPERIMENTAL)

 
 config ARCH_MEMORY_PROBE
        def_bool y
 
 config ARCH_MEMORY_PROBE
        def_bool y


@@ -383,15 +321,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
        depends on NUMA
 
        def_bool y
        depends on NUMA
 

-config OUT_OF_LINE_PFN_TO_PAGE
-       def_bool y
-       depends on DISCONTIGMEM
-

 config NR_CPUS
        int "Maximum number of CPUs (2-256)"
 config NR_CPUS
        int "Maximum number of CPUs (2-256)"

-       range 2 255
+       range 2 256

        depends on SMP
        depends on SMP

-       default "16" if X86_64_XEN

        default "8"
        help
          This allows you to specify the maximum number of CPUs which this
        default "8"
        help
          This allows you to specify the maximum number of CPUs which this


@@ -414,7 +347,6 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 
 config HPET_TIMER
        bool
 
 config HPET_TIMER
        bool

-       depends on !X86_64_XEN

        default y
        help
          Use the IA-PC HPET (High Precision Event Timer) to manage
        default y
        help
          Use the IA-PC HPET (High Precision Event Timer) to manage


@@ -428,51 +360,28 @@ config HPET_EMULATE_RTC
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y
 
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y
 

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

        default y
        select SWIOTLB
        default y
        select SWIOTLB

-       select AGP
-       depends on PCI && !X86_64_XEN
-       help
-         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
+       depends on PCI

        help
        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.
+         Support the 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 northbridge IOMMU
+         and a software emulation used on other systems.

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

-# need this always selected by IOMMU for the VIA workaround
+# need this always enabled with GART_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

-       depends on !X86_64_XEN

        default y
        help
           Include a machine check error handler to report hardware errors.
        default y
        help
           Include a machine check error handler to report hardware errors.


@@ -498,14 +407,14 @@ config X86_MCE_AMD
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && !X86_64_XEN
+       depends on EXPERIMENTAL

        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 independent of the system firmware.   And like a reboot
+         but it is indepedent 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 similarity to the exec system call.
+         The name comes from the similiarity 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


@@ -522,10 +431,10 @@ config CRASH_DUMP
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000" if CRASH_DUMP
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000" if CRASH_DUMP

-       default "0x200000"
+       default "0x100000"

        help
          This gives the physical address where the kernel is loaded. Normally
        help
          This gives the physical address where the kernel is loaded. Normally

-         for regular kernels this value is 0x200000 (2MB). But in the case
+         for regular kernels this value is 0x100000 (1MB). But in the case

          of kexec on panic the fail safe kernel needs to run at a different
          address than the panic-ed kernel. This option is used to set the load
          address for kernels used to capture crash dump on being kexec'ed
          of kexec on panic the fail safe kernel needs to run at a different
          address than the panic-ed kernel. This option is used to set the load
          address for kernels used to capture crash dump on being kexec'ed


@@ -557,18 +466,6 @@ config SECCOMP
 
 source kernel/Kconfig.hz
 
 
 source kernel/Kconfig.hz
 

-config REORDER
-       bool "Function reordering"
-       default n
-       help
-         This option enables the toolchain to reorder functions for a more 
-         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
 
 #


@@ -593,11 +490,8 @@ config GENERIC_PENDING_IRQ
        default y
 
 menu "Power management options"
        default y
 
 menu "Power management options"

-       depends on !XEN_UNPRIVILEGED_GUEST

 
 

-if !X86_64_XEN

 source kernel/power/Kconfig
 source kernel/power/Kconfig

-endif

 
 source "drivers/acpi/Kconfig"
 
 
 source "drivers/acpi/Kconfig"
 


@@ -620,20 +514,15 @@ config PCI_MMCONFIG
        bool "Support mmconfig PCI config space access"
        depends on PCI && ACPI
 
        bool "Support mmconfig PCI config space access"
        depends on PCI && ACPI
 

-config XEN_PCIDEV_FRONTEND
-       bool "Xen PCI Frontend"
-       depends on PCI && X86_64_XEN
-       default y
-       help
-         The PCI device frontend driver allows the kernel to import arbitrary
-         PCI devices from a PCI backend to support PCI driver domains.
-
-config XEN_PCIDEV_FE_DEBUG
-       bool "Xen PCI Frontend Debugging"
-       depends on XEN_PCIDEV_FRONTEND
-       default n
-       help
-         Enables some debug statements within the PCI Frontend.
+config UNORDERED_IO
+       bool "Unordered IO mapping access"
+       depends on EXPERIMENTAL
+       help
+         Use unordered stores to access IO memory mappings in device drivers.
+        Still very experimental. When a driver works on IA64/ppc64/pa-risc it should
+        work with this option, but it makes the drivers behave differently
+        from i386. Requires that the driver writer used memory barriers
+        properly.

 
 source "drivers/pci/pcie/Kconfig"
 
 
 source "drivers/pci/pcie/Kconfig"
 


@@ -707,6 +596,4 @@ source "security/Kconfig"
 
 source "crypto/Kconfig"
 
 
 source "crypto/Kconfig"
 

-source "drivers/xen/Kconfig"
-

 source "lib/Kconfig"
 source "lib/Kconfig"