vserver 1.9.5.x5

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

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index a9abc29..563a3cb 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -30,6 +30,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 config TIME_INTERPOLATION
        bool
        default y
@@ -57,11 +61,12 @@ config IA64_GENERIC
          will run on any supported IA-64 system.  However, if you configure
          a kernel for your specific system, it will be faster and smaller.
 
-         generic        For any supported IA-64 system
-         DIG-compliant  For DIG ("Developer's Interface Guide") compliant systems
-         HP-zx1/sx1000  For HP systems
-         SGI-SN2        For SGI Altix systems
-         Ski-simulator  For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
+         generic               For any supported IA-64 system
+         DIG-compliant         For DIG ("Developer's Interface Guide") compliant systems
+         HP-zx1/sx1000         For HP systems
+         HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
+         SGI-SN2               For SGI Altix systems
+         Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
 
          If you don't know what to do, choose "generic".
 
@@ -74,6 +79,15 @@ config IA64_HP_ZX1
          Build a kernel that runs on HP zx1 and sx1000 systems.  This adds
          support for the HP I/O MMU.
 
+config IA64_HP_ZX1_SWIOTLB
+       bool "HP-zx1/sx1000 with software I/O TLB"
+       help
+         Build a kernel that runs on HP zx1 and sx1000 systems even when they
+         have broken PCI devices which cannot DMA to full 32 bits.  Apart
+         from support for the HP I/O MMU, this includes support for the software
+         I/O TLB, which allows supporting the broken devices at the expense of
+         wasting some kernel memory (about 2MB by default).
+
 config IA64_SGI_SN2
        bool "SGI-SN2"
        help
@@ -144,14 +158,6 @@ config IA64_BRL_EMU
        depends on ITANIUM
        default y
 
-config ITANIUM_BSTEP_SPECIFIC
-       bool "Itanium B-step specific code"
-       depends on ITANIUM
-       help
-         Select this option to build a kernel for an Itanium prototype system
-         with a B-step CPU.  You have a B-step CPU if the "revision" field in
-         /proc/cpuinfo has a value in the range from 1 to 4.
-
 # align cache-sensitive data to 128 bytes
 config IA64_L1_CACHE_SHIFT
        int
@@ -178,9 +184,13 @@ config VIRTUAL_MEM_MAP
          require the DISCONTIGMEM option for your machine. If you are
          unsure, say Y.
 
+config HOLES_IN_ZONE
+       bool
+       default y if VIRTUAL_MEM_MAP
+
 config DISCONTIGMEM
        bool "Discontiguous memory support"
-       depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1) && NUMA && VIRTUAL_MEM_MAP
+       depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
        help
          Say Y to support efficient handling of discontiguous physical memory,
@@ -241,13 +251,14 @@ config NR_CPUS
          performance hit.
 
 config HOTPLUG_CPU
-    bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-    depends on SMP && HOTPLUG && EXPERIMENTAL
+       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       depends on SMP && EXPERIMENTAL
+       select HOTPLUG
        default n
-    ---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.
+       ---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.
 
 config PREEMPT
        bool "Preemptible Kernel"
@@ -302,6 +313,11 @@ config IA64_PALINFO
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
 
+config ACPI_DEALLOCATE_IRQ
+       bool
+       depends on IOSAPIC && EXPERIMENTAL
+       default y
+
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
@@ -312,7 +328,7 @@ menu "Power management and ACPI"
 
 config PM
        bool "Power Management support"
-       depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1
+       depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB
        default y
        help
          "Power Management" means that parts of your computer are shut
@@ -381,6 +397,17 @@ source "fs/Kconfig"
 
 source "lib/Kconfig"
 
+#
+# Use the generic interrupt handling code in kernel/irq/:
+#
+config GENERIC_HARDIRQS
+       bool
+       default y
+
+config GENERIC_IRQ_PROBE
+       bool
+       default y
+
 source "arch/ia64/hp/sim/Kconfig"
 
 source "arch/ia64/oprofile/Kconfig"