Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 1a6348b565fb4af6480e16afc988fe9c8cbef34c..6566d13db04fec3c5417cde60c0295319f405c9f 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -19,6 +19,14 @@ config SPARC64
          SPARC64 ports; its web page is available at
          <http://www.ultralinux.org/>.
 
+config GENERIC_TIME
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
 config 64BIT
        def_bool y
 
@@ -26,15 +34,15 @@ config MMU
        bool
        default y
 
-config STACKTRACE_SUPPORT
+config QUICKLIST
        bool
        default y
 
-config LOCKDEP_SUPPORT
+config STACKTRACE_SUPPORT
        bool
        default y
 
-config TIME_INTERPOLATION
+config LOCKDEP_SUPPORT
        bool
        default y
 
@@ -113,6 +121,8 @@ config GENERIC_HARDIRQS
 
 menu "General machine setup"
 
+source "kernel/time/Kconfig"
+
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -137,10 +147,10 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-64)"
-       range 2 64
+       int "Maximum number of CPUs (2-1024)"
+       range 2 1024
        depends on SMP
-       default "32"
+       default "64"
 
 source "drivers/cpufreq/Kconfig"
 
@@ -214,9 +224,7 @@ config ARCH_SPARSEMEM_ENABLE
 
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
-
-config LARGE_ALLOCS
-       def_bool y
+       select SPARSEMEM_STATIC
 
 source "mm/Kconfig"
 
@@ -299,6 +307,7 @@ config SUN_IO
 
 config PCI
        bool "PCI support"
+       select ARCH_SUPPORTS_MSI
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
@@ -311,8 +320,10 @@ config PCI
          doesn't.
 
 config PCI_DOMAINS
-       bool
-       default PCI
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
 
 source "drivers/pci/Kconfig"
 
@@ -387,6 +398,15 @@ config SCHED_SMT
          when dealing with UltraSPARC cpus at a cost of slightly increased
          overhead in some places. If unsure say N here.
 
+config SCHED_MC
+       bool "Multi-core scheduler support"
+       depends on SMP
+       default y
+       help
+         Multi-core scheduler support improves the CPU scheduler's decision
+         making when dealing with multi-core CPU chips at a cost of slightly
+         increased overhead in some places. If unsure say N here.
+
 source "kernel/Kconfig.preempt"
 
 config CMDLINE_BOOL