x86: Unify i386 and x86-64 early quirks

[safe/jmp/linux-2.6] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 21afa69..ecfd4b1 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -24,6 +24,42 @@ config X86
        bool
        default y
 
        bool
        default y
 

+config GENERIC_TIME
+       bool
+       default y
+
+config GENERIC_TIME_VSYSCALL
+       bool
+       default y
+
+config GENERIC_CMOS_UPDATE
+       bool
+       default y
+
+config CLOCKSOURCE_WATCHDOG
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+       bool
+       default y
+
+config ZONE_DMA32
+       bool
+       default y
+
+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       default y
+

 config SEMAPHORE_SLEEPERS
        bool
        default y
 config SEMAPHORE_SLEEPERS
        bool
        default y


@@ -32,6 +68,10 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config ZONE_DMA
+       bool
+       default y
+

 config ISA
        bool
 
 config ISA
        bool
 


@@ -45,6 +85,10 @@ 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


@@ -69,14 +113,59 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
        bool
        default y
 

+config ARCH_POPULATES_NODE_MAP
+       def_bool y
+
+config DMI
+       bool
+       default y
+
+config AUDIT_ARCH
+       bool
+       default y
+
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+

 source "init/Kconfig"
 
 
 menu "Processor type and features"
 
 source "init/Kconfig"
 
 
 menu "Processor type and features"
 

+source "kernel/time/Kconfig"
+
+choice
+       prompt "Subarchitecture Type"
+       default X86_PC
+
+config X86_PC
+       bool "PC-compatible"
+       help
+         Choose this option if your computer is a standard PC or compatible.
+
+config X86_VSMP
+       bool "Support for ScaleMP vSMP"
+       depends on PCI
+        help
+         Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
+         supposed to run on these EM64T-based machines.  Only choose this option
+         if you have one of these machines.
+
+endchoice
+

 choice
        prompt "Processor family"
 choice
        prompt "Processor family"

-       default MK8
+       default GENERIC_CPU

 
 config MK8
        bool "AMD-Opteron/Athlon64"
 
 config MK8
        bool "AMD-Opteron/Athlon64"


@@ -84,16 +173,28 @@ config MK8
          Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 
 config MPSC
          Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 
 config MPSC

-       bool "Intel EM64T"
+       bool "Intel P4 / older Netburst based Xeon"

        help
        help

-         Optimize for Intel Pentium 4 and Xeon CPUs with Intel
-         Extended Memory 64 Technology(EM64T). For details see
-         <http://www.intel.com/technology/64bitextensions/>.
+         Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey
+         Xeon CPUs with Intel 64bit which is compatible with x86-64.
+         Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
+          Netburst core and shouldn't use this option. You can distinguish them
+         using the cpu family field
+         in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
+
+config MCORE2
+       bool "Intel Core2 / newer Xeon"
+       help
+         Optimize for Intel Core2 and newer Xeons (51xx)
+         You can distinguish the newer Xeons from the older ones using
+         the cpu family field in /proc/cpuinfo. 15 is an older Xeon
+         (use CONFIG_MPSC then), 6 is a newer one.

 
 config GENERIC_CPU
        bool "Generic-x86-64"
        help
          Generic x86-64 CPU.
 
 config GENERIC_CPU
        bool "Generic-x86-64"
        help
          Generic x86-64 CPU.

+         Run equally well on all x86-64 CPUs.

 
 endchoice
 
 
 endchoice
 


@@ -103,12 +204,17 @@ endchoice
 config X86_L1_CACHE_BYTES
        int
        default "128" if GENERIC_CPU || MPSC
 config X86_L1_CACHE_BYTES
        int
        default "128" if GENERIC_CPU || MPSC

-       default "64" if MK8
+       default "64" if MK8 || MCORE2

 
 config X86_L1_CACHE_SHIFT
        int
        default "7" if GENERIC_CPU || MPSC
 
 config X86_L1_CACHE_SHIFT
        int
        default "7" if GENERIC_CPU || MPSC

-       default "6" if MK8
+       default "6" if MK8 || MCORE2
+
+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


@@ -120,6 +226,7 @@ config X86_GOOD_APIC
 
 config MICROCODE
        tristate "/dev/cpu/microcode - Intel CPU microcode support"
 
 config MICROCODE
        tristate "/dev/cpu/microcode - Intel CPU microcode support"

+       select FW_LOADER

        ---help---
          If you say Y here the 'File systems' section, you will be
          able to update the microcode on Intel processors. You will
        ---help---
          If you say Y here the 'File systems' section, you will be
          able to update the microcode on Intel processors. You will


@@ -135,6 +242,11 @@ config MICROCODE
          If you use modprobe or kmod you may also want to add the line
          'alias char-major-10-184 microcode' to your /etc/modules.conf file.
 
          If you use modprobe or kmod you may also want to add the line
          'alias char-major-10-184 microcode' to your /etc/modules.conf file.
 

+config MICROCODE_OLD_INTERFACE
+       bool
+       depends on MICROCODE
+       default y
+

 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        help
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        help


@@ -224,24 +336,59 @@ 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
+       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"
 
 source "kernel/Kconfig.preempt"
 

-config K8_NUMA
-       bool "K8 NUMA support"
-       select NUMA
+config NUMA
+       bool "Non Uniform Memory Access (NUMA) Support"

        depends on SMP
        help
        depends on SMP
        help

-         Enable NUMA (Non Unified Memory Architecture) support for
-         AMD Opteron Multiprocessor systems. The kernel will try to allocate
-         memory used by a CPU on the local memory controller of the CPU
-         and add some more NUMA awareness to the kernel.
-         This code is recommended on all multiprocessor Opteron systems
-         and normally doesn't hurt on others.
+        Enable NUMA (Non Uniform Memory Access) support. The kernel 
+        will try to allocate memory used by a CPU on the local memory 
+        controller of the CPU and add some more NUMA awareness to the kernel.
+        This code is recommended on all multiprocessor Opteron systems.
+        If the system is EM64T, you should say N unless your system is EM64T 
+        NUMA. 
+
+config K8_NUMA
+       bool "Old style AMD Opteron NUMA detection"
+       depends on NUMA && PCI
+       default y
+       help
+        Enable K8 NUMA node topology detection.  You should say Y here if
+        you have a multi processor AMD K8 system. This uses an old
+        method to read the NUMA configuration directly from the builtin
+        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 
+       select PCI
+       select ACPI_NUMA
+       default y
+       help
+        Enable ACPI SRAT based node topology detection.

 
 config NUMA_EMU
 
 config NUMA_EMU

-       bool "NUMA emulation support"
-       select NUMA
-       depends on SMP
+       bool "NUMA emulation"
+       depends on NUMA

        help
          Enable NUMA emulation. A flat machine will be split
          into virtual nodes when booted with "numa=fake=N", where N is the
        help
          Enable NUMA emulation. A flat machine will be split
          into virtual nodes when booted with "numa=fake=N", where N is the


@@ -252,21 +399,18 @@ config ARCH_DISCONTIGMEM_ENABLE
        depends on NUMA
        default y
 
        depends on NUMA
        default y
 

-config NUMA
-       bool
-       default n
-
-config ARCH_DISCONTIGMEM_ENABLE
-       def_bool y
-       depends on NUMA
-

 config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on NUMA
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
 config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on NUMA
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y

-       depends on NUMA
+       depends on (NUMA || EXPERIMENTAL)
+       select SPARSEMEM_VMEMMAP_ENABLE
+
+config ARCH_MEMORY_PROBE
+       def_bool y
+       depends on MEMORY_HOTPLUG

 
 config ARCH_FLATMEM_ENABLE
        def_bool y
 
 config ARCH_FLATMEM_ENABLE
        def_bool y


@@ -274,30 +418,48 @@ config ARCH_FLATMEM_ENABLE
 
 source "mm/Kconfig"
 
 
 source "mm/Kconfig"
 

+config MEMORY_HOTPLUG_RESERVE
+       def_bool y
+       depends on (MEMORY_HOTPLUG && DISCONTIGMEM)
+

 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y

+       depends on NUMA
+
+config OUT_OF_LINE_PFN_TO_PAGE
+       def_bool y
+       depends on DISCONTIGMEM

 
 config NR_CPUS
 
 config NR_CPUS

-       int "Maximum number of CPUs (2-256)"
-       range 2 256
+       int "Maximum number of CPUs (2-255)"
+       range 2 255

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

-         kernel will support. Current maximum is 256 CPUs due to
+         kernel will support. Current maximum is 255 CPUs due to

          APIC addressing limits. Less depending on the hardware.
 
          This is purely to save memory - each supported CPU requires
          memory in the static kernel configuration.
 
          APIC addressing limits. Less depending on the hardware.
 
          This is purely to save memory - each supported CPU requires
          memory in the static kernel configuration.
 

+config PHYSICAL_ALIGN
+       hex
+       default "0x200000"
+

 config HOTPLUG_CPU
 config HOTPLUG_CPU

-       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"

        depends on SMP && HOTPLUG && EXPERIMENTAL
        help
                Say Y here to experiment with turning CPUs off and on.  CPUs
                can be controlled through /sys/devices/system/cpu/cpu#.
        depends on SMP && HOTPLUG && EXPERIMENTAL
        help
                Say Y here to experiment with turning CPUs off and on.  CPUs
                can be controlled through /sys/devices/system/cpu/cpu#.

-               Say N if you want to disable CPU hotplug.
+               This is also required for suspend/hibernation on SMP systems.

 
 

+               Say N if you want to disable CPU hotplug and don't need to
+               suspend.
+
+config ARCH_ENABLE_MEMORY_HOTPLUG
+       def_bool y

 
 config HPET_TIMER
        bool
 
 config HPET_TIMER
        bool


@@ -310,52 +472,68 @@ config HPET_TIMER
          as it is off-chip.  You can find the HPET spec at
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
          as it is off-chip.  You can find the HPET spec at
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 

-config X86_PM_TIMER
-       bool "PM timer"
-       depends on ACPI
-       default y
-       help
-         Support the ACPI PM timer for time keeping. This is slow,
-         but is useful on some chipsets without HPET on systems with more
-         than one CPU. On a single processor or single socket multi core
-         system it is normally not required.
-         When the PM timer is active 64bit vsyscalls are disabled
-         and should not be enabled (/proc/sys/kernel/vsyscall64 should
-         not be changed).
-         The kernel selects the PM timer only as a last resort, so it is
-         useful to enable just in case.
-

 config HPET_EMULATE_RTC
 config HPET_EMULATE_RTC

-       bool "Provide RTC interrupt"
+       bool

        depends on HPET_TIMER && RTC=y
        depends on HPET_TIMER && RTC=y

+       default y

 
 

-config GART_IOMMU
-       bool "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
        default y

+       select SWIOTLB
+       select AGP

        depends on PCI
        help
        depends on PCI
        help

-         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 IOMMU
-         and a software emulation used on some other systems.
+         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 hardware 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"
+       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.
 
          If unsure, say Y.
 

-# need this always enabled with GART_IOMMU for the VIA workaround
-config SWIOTLB
-       bool
-       depends on GART_IOMMU
-       default y
+config CALGARY_IOMMU_ENABLED_BY_DEFAULT
+       bool "Should Calgary be enabled by default?"
+       default y
+       depends on CALGARY_IOMMU
+       help
+         Should Calgary be enabled by default? if you choose 'y', Calgary
+         will be used (if it exists). If you choose 'n', Calgary will not be
+         used even if it exists. If you choose 'n' and would like to use
+         Calgary anyway, pass 'iommu=calgary' on the kernel command line.
+         If unsure, say Y.

 
 

-config DUMMY_IOMMU
+# need this always selected by IOMMU for the VIA workaround
+config SWIOTLB

        bool
        bool

-       depends on !GART_IOMMU && !SWIOTLB
-       default y

        help
        help

-         Don't use IOMMU code. This will cause problems when you have more than 4GB
-         of memory and any 32-bit devices. Don't turn on unless you know what you
-         are doing.
+         Support for software bounce buffers used on x86-64 systems
+         which don't have a hardware IOMMU (e.g. the current generation
+         of Intel's x86-64 CPUs). Using this PCI devices which can only
+         access 32-bits of memory can be used on systems with more than
+         3 GB of memory. If unsure, say Y.

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


@@ -374,27 +552,23 @@ config X86_MCE_INTEL
           Additional support for intel specific MCE features such as
           the thermal monitor.
 
           Additional support for intel specific MCE features such as
           the thermal monitor.
 

-config PHYSICAL_START
-       hex "Physical address where the kernel is loaded" if EMBEDDED
-       default "0x100000"
+config X86_MCE_AMD
+       bool "AMD MCE features"
+       depends on X86_MCE && X86_LOCAL_APIC
+       default y

        help
        help

-         This gives the physical address where the kernel is loaded.
-         Primarily used in the case of kexec on panic where the
-         fail safe kernel needs to run at a different address than
-         the panic-ed kernel.
-
-         Don't change this unless you know what you are doing.
+          Additional support for AMD specific MCE features such as
+          the DRAM Error Threshold.

 
 config KEXEC
 
 config KEXEC

-       bool "kexec system call (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "kexec system call"

        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


@@ -402,6 +576,72 @@ config KEXEC
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
 
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
 

+config CRASH_DUMP
+       bool "kernel crash dumps (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         Generate crash dump after being started by kexec.
+         This should be normally only set in special crash dump kernels
+         which are loaded in the main kernel with kexec-tools into
+         a specially reserved region and then later executed after
+         a crash by kdump/kexec. The crash dump kernel must be compiled
+         to a memory address not used by the main kernel or BIOS using
+         PHYSICAL_START, or it must be built as a relocatable image
+         (CONFIG_RELOCATABLE=y).
+         For more details see Documentation/kdump/kdump.txt
+
+config RELOCATABLE
+       bool "Build a relocatable kernel (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         Builds a relocatable kernel. This enables loading and running
+         a kernel binary from a different physical address than it has
+         been compiled for.
+
+         One use is for the kexec on panic case where the recovery kernel
+         must live at a different physical address than the primary
+         kernel.
+
+         Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address
+         it has been loaded at and the compile time physical address
+         (CONFIG_PHYSICAL_START) is ignored.
+
+config PHYSICAL_START
+       hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+       default "0x200000"
+       help
+         This gives the physical address where the kernel is loaded. It
+         should be aligned to 2MB boundary.
+
+         If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then
+         bzImage will decompress itself to above physical address and
+         run from there. Otherwise, bzImage will run from the address where
+         it has been loaded by the boot loader and will ignore above physical
+         address.
+
+         In normal kdump cases one does not have to set/change this option
+         as now bzImage can be compiled as a completely relocatable image
+         (CONFIG_RELOCATABLE=y) and be used to load and run from a different
+         address. This option is mainly useful for the folks who don't want
+         to use a bzImage for capturing the crash dump and want to use a
+         vmlinux instead.
+
+         So if you are using bzImage for capturing the crash dump, leave
+         the value here unchanged to 0x200000 and set CONFIG_RELOCATABLE=y.
+         Otherwise if you plan to use vmlinux for capturing the crash dump
+         change this value to start of the reserved region (Typically 16MB
+         0x1000000). In other words, it can be set based on the "X" value as
+         specified in the "crashkernel=YM@XM" command line boot parameter
+         passed to the panic-ed kernel. Typically this parameter is set as
+         crashkernel=64M@16M. Please take a look at
+         Documentation/kdump/kdump.txt for more details about crash dumps.
+
+         Usage of bzImage for capturing the crash dump is advantageous as
+         one does not have to build two kernels. Same kernel can be used
+         as production kernel and capture kernel.
+
+         Don't change this unless you know what you are doing.
+

 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
        depends on PROC_FS
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
        depends on PROC_FS


@@ -419,8 +659,36 @@ config SECCOMP
 
          If unsure, say Y. Only embedded should say N here.
 
 
          If unsure, say Y. Only embedded should say N here.
 

+config CC_STACKPROTECTOR
+       bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         This option turns on the -fstack-protector GCC feature. This
+         feature puts, at the beginning of critical functions, a canary
+         value on the stack just before the return address, and validates
+         the value just before actually returning.  Stack based buffer
+         overflows (that need to overwrite this return address) now also
+         overwrite the canary, which gets detected and the attack is then
+         neutralized via a kernel panic.
+
+         This feature requires gcc version 4.2 or above, or a distribution
+         gcc with the feature backported. Older versions are automatically
+         detected and for those versions, this configuration option is ignored.
+
+config CC_STACKPROTECTOR_ALL
+       bool "Use stack-protector for all functions"
+       depends on CC_STACKPROTECTOR
+       help
+         Normally, GCC only inserts the canary value protection for
+         functions that use large-ish on-stack buffers. By enabling
+         this option, GCC will be asked to do this for ALL functions.
+

 source kernel/Kconfig.hz
 
 source kernel/Kconfig.hz
 

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

 endmenu
 
 #
 endmenu
 
 #


@@ -448,9 +716,14 @@ menu "Power management options"
 
 source kernel/power/Kconfig
 
 
 source kernel/power/Kconfig
 

+config ARCH_HIBERNATION_HEADER
+       bool
+       depends on HIBERNATION
+       default y
+

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

-source "arch/x86_64/kernel/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig_64"

 
 endmenu
 
 
 endmenu
 


@@ -458,6 +731,7 @@ menu "Bus options (PCI etc.)"
 
 config PCI
        bool "PCI support"
 
 config PCI
        bool "PCI support"

+       select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)

 
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
 
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT


@@ -469,15 +743,10 @@ 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 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.
+config PCI_DOMAINS
+       bool
+       depends on PCI
+       default y

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


@@ -497,12 +766,12 @@ source "fs/Kconfig.binfmt"
 config IA32_EMULATION
        bool "IA32 Emulation"
        help
 config IA32_EMULATION
        bool "IA32 Emulation"
        help

-         Include code to run 32-bit programs under a 64-bit kernel. You should likely
-         turn this on, unless you're 100% sure that you don't have any 32-bit programs
-         left.
+         Include code to run 32-bit programs under a 64-bit kernel. You should
+         likely turn this on, unless you're 100% sure that you don't have any
+         32-bit programs left.

 
 config IA32_AOUT
 
 config IA32_AOUT

-       bool "IA32 a.out support"
+       tristate "IA32 a.out support"

        depends on IA32_EMULATION
        help
          Support old a.out binaries in the 32bit emulation.
        depends on IA32_EMULATION
        help
          Support old a.out binaries in the 32bit emulation.


@@ -512,16 +781,14 @@ config COMPAT
        depends on IA32_EMULATION
        default y
 
        depends on IA32_EMULATION
        default y
 

+config COMPAT_FOR_U64_ALIGNMENT
+       def_bool COMPAT
+

 config SYSVIPC_COMPAT
        bool
        depends on COMPAT && SYSVIPC
        default y
 
 config SYSVIPC_COMPAT
        bool
        depends on COMPAT && SYSVIPC
        default y
 

-config UID16
-       bool
-       depends on IA32_EMULATION
-       default y
-

 endmenu
 
 source "net/Kconfig"
 endmenu
 
 source "net/Kconfig"


@@ -532,7 +799,20 @@ source "drivers/firmware/Kconfig"
 
 source fs/Kconfig
 
 
 source fs/Kconfig
 

-source "arch/x86_64/oprofile/Kconfig"
+menu "Instrumentation Support"
+
+source "arch/x86/oprofile/Kconfig"
+
+config KPROBES
+       bool "Kprobes"
+       depends on KALLSYMS && MODULES
+       help
+         Kprobes allows you to trap at almost any kernel address and
+         execute a callback function.  register_kprobe() establishes
+         a probepoint and specifies the callback.  Kprobes is useful
+         for kernel debugging, non-intrusive instrumentation and testing.
+         If in doubt, say "N".
+endmenu

 
 source "arch/x86_64/Kconfig.debug"
 
 
 source "arch/x86_64/Kconfig.debug"