1 files changed, 25 insertions, 3 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index bc106519482c..9ed69e79dd1d 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -70,6 +70,15 @@ 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
@@ -77,6 +86,7 @@ choice
 config IA64_GENERIC
         bool "generic"
         select ACPI
+        select PCI
         select NUMA
         select ACPI_NUMA
         help
@@ -252,7 +262,7 @@ config NR_CPUS
         int "Maximum number of CPUs (2-1024)"
         range 2 1024
         depends on SMP
-        default "64"
+        default "1024"
         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
@@ -270,10 +280,12 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+
 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
@@ -346,7 +358,7 @@ config NUMA
 config NODES_SHIFT
         int "Max num nodes shift(3-10)"
         range 3 10
-        default "8"
+        default "10"
         depends on NEED_MULTIPLE_NODES
         help
           This option specifies the maximum number of nodes in your SSI system.
@@ -374,6 +386,10 @@ 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
@@ -457,6 +473,8 @@ config PCI_DOMAINS
         bool
         default PCI
 
+source "drivers/pci/pcie/Kconfig"
+
 source "drivers/pci/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
@@ -491,6 +509,10 @@ 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"