- port, cleanup Emulab ICMP Ping Of Death (IPOD) patch from 2.4.x

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

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 991916a..ad903fc 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -44,10 +44,7 @@ choice
 
 config IA64_GENERIC
        bool "generic"
-       select NUMA
-       select ACPI_NUMA
        select VIRTUAL_MEM_MAP
-       select DISCONTIGMEM
        help
          This selects the system type of your hardware.  A "generic" kernel
          will run on any supported IA-64 system.  However, if you configure
@@ -149,20 +146,6 @@ config IA64_L1_CACHE_SHIFT
        default "6" if ITANIUM
 
 # align cache-sensitive data to 64 bytes
-config MCKINLEY_ASTEP_SPECIFIC
-       bool "McKinley A-step specific code"
-       depends on MCKINLEY
-       help
-         Select this option to build a kernel for an IA-64 McKinley prototype
-         system with any A-stepping CPU.
-
-config MCKINLEY_A0_SPECIFIC
-       bool "McKinley A0/A1-step specific code"
-       depends on MCKINLEY_ASTEP_SPECIFIC
-       help
-         Select this option to build a kernel for an IA-64 McKinley prototype
-         system with an A0 or A1 stepping CPU.
-
 config NUMA
        bool "NUMA support"
        depends on !IA64_HP_SIM
@@ -244,6 +227,15 @@ config NR_CPUS
          than 64 will cause the use of a CPU mask array, causing a small
          performance hit.
 
+config HOTPLUG_CPU
+    bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+    depends on SMP && HOTPLUG && EXPERIMENTAL
+       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.
+
 config PREEMPT
        bool "Preemptible Kernel"
         help
@@ -393,7 +385,7 @@ config IA64_GRANULE_16MB
 
 config IA64_GRANULE_64MB
        bool "64MB"
-       depends on !(IA64_GENERIC || IA64_HP_ZX1)
+       depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_SGI_SN2)
 
 endchoice
 
@@ -491,6 +483,8 @@ config SYSVIPC_COMPAT
        default y
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"