Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b946bac..1e3ad1e 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -58,20 +58,6 @@ config GENERIC_IOMAP
        bool
        default y
 
-config XEN
-       bool "Xen hypervisor support"
-       default y
-       help
-         Enable Xen hypervisor support.  Resulting kernel runs
-         both as a guest OS on Xen and natively on hardware.
-
-config XEN_IA64_VDSO_PARAVIRT
-       bool
-       depends on XEN && !ITANIUM
-       default y
-       help
-         vDSO paravirtualization
-
 config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
@@ -84,15 +70,6 @@ config DMA_IS_DMA32
        bool
        default y
 
-config DMA_IS_NORMAL
-       bool
-       depends on IA64_SGI_SN2
-       default y
-
-config AUDIT_ARCH
-       bool
-       default y
-
 choice
        prompt "System type"
        default IA64_GENERIC
@@ -100,7 +77,6 @@ choice
 config IA64_GENERIC
        bool "generic"
        select ACPI
-       select PCI
        select NUMA
        select ACPI_NUMA
        help
@@ -276,7 +252,7 @@ config NR_CPUS
        int "Maximum number of CPUs (2-1024)"
        range 2 1024
        depends on SMP
-       default "1024"
+       default "64"
        help
          You should set this to the number of CPUs in your system, but
          keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but
@@ -300,6 +276,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 config SCHED_SMT
        bool "SMT scheduler support"
        depends on SMP
+       default off
        help
          Improves the CPU scheduler's decision making when dealing with
          Intel IA64 chips with MultiThreading at a cost of slightly increased
@@ -372,7 +349,7 @@ config NUMA
 config NODES_SHIFT
        int "Max num nodes shift(3-10)"
        range 3 10
-       default "10"
+       default "8"
        depends on NEED_MULTIPLE_NODES
        help
          This option specifies the maximum number of nodes in your SSI system.
@@ -400,10 +377,6 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
-config HAVE_ARCH_NODEDATA_EXTENSION
-       def_bool y
-       depends on NUMA
-
 config IA32_SUPPORT
        bool "Support for Linux/x86 binaries"
        help
@@ -479,23 +452,6 @@ config PCI_DOMAINS
        bool
        default PCI
 
-config XEN_PCIDEV_FRONTEND
-       bool "Xen PCI Frontend"
-       depends on PCI && 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.
-
-source "drivers/pci/pcie/Kconfig"
-
 source "drivers/pci/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
@@ -530,10 +486,6 @@ config GENERIC_PENDING_IRQ
        depends on GENERIC_HARDIRQS && SMP
        default y
 
-config IRQ_PER_CPU
-       bool
-       default y
-
 source "arch/ia64/hp/sim/Kconfig"
 
 menu "Instrumentation Support"
@@ -559,34 +511,3 @@ source "kernel/vserver/Kconfig"
 source "security/Kconfig"
 
 source "crypto/Kconfig"
-
-#
-# override default values of drivers/xen/Kconfig
-#
-if XEN
-config XEN_UTIL
-       default n
-
-config HAVE_ARCH_ALLOC_SKB
-       default y
-
-config HAVE_ARCH_DEV_ALLOC_SKB
-       default y
-
-config XEN_BALLOON
-       default y
-
-config XEN_SKBUFF
-       default y
-
-config XEN_DEVMEM
-       default n
-
-config XEN_REBOOT
-       default y
-
-config XEN_SMPBOOT
-       default n
-endif
-
-source "drivers/xen/Kconfig"