- Updated to 3.4-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3c1432d..9b32d0e 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -23,9 +23,16 @@ config IA64
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
        select HAVE_GENERIC_HARDIRQS
+       select HAVE_MEMBLOCK
+       select HAVE_MEMBLOCK_NODE_MAP
+       select ARCH_DISCARD_MEMBLOCK
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select IRQ_PER_CPU
+       select GENERIC_IRQ_SHOW
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_IOMAP
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -77,10 +84,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE
        depends on HUGETLB_PAGE
        default y
 
-config GENERIC_FIND_NEXT_BIT
-       bool
-       default y
-
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -92,6 +95,9 @@ config GENERIC_TIME_VSYSCALL
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
+config GENERIC_GPIO
+       bool
+
 config DMI
        bool
        default y
@@ -100,9 +106,8 @@ config EFI
        bool
        default y
 
-config GENERIC_IOMAP
-       bool
-       default y
+config ARCH_CLOCKSOURCE_DATA
+       def_bool y
 
 config SCHED_OMIT_FRAME_POINTER
        bool
@@ -157,7 +162,6 @@ config IA64_GENERIC
        select ACPI_NUMA
        select SWIOTLB
        select PCI_MSI
-       select DMAR
        help
          This selects the system type of your hardware.  A "generic" kernel
          will run on any supported IA-64 system.  However, if you configure
@@ -413,11 +417,11 @@ config PERMIT_BSP_REMOVE
        support. 
 
 config FORCE_CPEI_RETARGET
-       bool "Force assumption that CPEI can be re-targetted"
+       bool "Force assumption that CPEI can be re-targeted"
        depends on PERMIT_BSP_REMOVE
        default n
        ---help---
-       Say Y if you need to force the assumption that CPEI can be re-targetted to
+       Say Y if you need to force the assumption that CPEI can be re-targeted to
        any cpu in the system. This hint is available via ACPI 3.0 specifications.
        Tiger4 systems are capable of re-directing CPEI to any CPU other than BSP.
        This option it useful to enable this feature on older BIOS's as well.
@@ -470,9 +474,6 @@ config NODES_SHIFT
          MAX_NUMNODES will be 2^(This value).
          If in doubt, use the default.
 
-config ARCH_POPULATES_NODE_MAP
-       def_bool y
-
 # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
 # VIRTUAL_MEM_MAP has been retained for historical reasons.
 config VIRTUAL_MEM_MAP
@@ -511,15 +512,6 @@ config ARCH_PROC_KCORE_TEXT
 config IA64_MCA_RECOVERY
        tristate "MCA recovery from errors other than TLB."
 
-config IA64_CPE_MIGRATE
-       tristate "Migrate data off pages with correctable errors"
-       default m
-       help
-         Migrate data off pages with correctable memory errors.  Selecting
-         Y will build this functionality into the kernel.  Selecting M will
-         build this functionality as a kernel loadable module.  Installing
-         the module will turn on the functionality.
-
 config PERFMON
        bool "Performance monitor support"
        help
@@ -640,27 +632,6 @@ source "drivers/pci/hotplug/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-config DMAR
-        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
-        depends on IA64_GENERIC && ACPI && EXPERIMENTAL
-       help
-         DMA remapping (DMAR) devices support enables independent address
-         translations for Direct Memory Access (DMA) from devices.
-         These DMA remapping devices are reported via ACPI tables
-         and include PCI device scope covered by these DMA
-         remapping devices.
-
-config DMAR_DEFAULT_ON
-       def_bool y
-       prompt "Enable DMA Remapping Devices by default"
-       depends on DMAR
-       help
-         Selecting this option will enable a DMAR device at boot time if
-         one is found. If this option is not selected, DMAR support can
-         be enabled by passing intel_iommu=on to the kernel. It is
-         recommended you say N here while the DMAR code remains
-         experimental.
-
 endmenu
 
 endif
@@ -694,6 +665,3 @@ source "lib/Kconfig"
 
 config IOMMU_HELPER
        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
-
-config IOMMU_API
-       def_bool (DMAR)