upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index f279cf8..9e77cc6 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -16,8 +16,40 @@ config TIME_INTERPOLATION
        bool
        default y
 
+choice
+       prompt "Kernel page size"
+       default SPARC64_PAGE_SIZE_8KB
+
+config SPARC64_PAGE_SIZE_8KB
+       bool "8KB"
+       help
+         This lets you select the page size of the kernel.
+
+         8KB and 64KB work quite well, since Sparc ELF sections
+         provide for up to 64KB alignment.
+
+         Therefore, 512KB and 4MB are for expert hackers only.
+
+         If you don't know what to do, choose 8KB.
+
+config SPARC64_PAGE_SIZE_64KB
+       bool "64KB"
+
+config SPARC64_PAGE_SIZE_512KB
+       bool "512KB"
+
+config SPARC64_PAGE_SIZE_4MB
+       bool "4MB"
+
+endchoice
+
 source "init/Kconfig"
 
+config SYSVIPC_COMPAT
+       bool
+       depends on COMPAT && SYSVIPC
+       default y
+
 menu "General machine setup"
 
 config BBC_I2C
@@ -86,14 +118,15 @@ config VT_CONSOLE
 
 config HW_CONSOLE
        bool
+       depends on VT
        default y
 
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have
-         a system with only one CPU, like most personal computers, say N. If
-         you have a system with more than one CPU, say Y.
+         a system with only one CPU, say N. If you have a system with more than
+         one CPU, say Y.
 
          If you say N here, the kernel will run on single and multiprocessor
          machines, but will use only one CPU of a multiprocessor machine. If
@@ -101,17 +134,11 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
-         Note that if you say Y here and choose architecture "586" or
-         "Pentium" under "Processor family", the kernel will not work on 486
-         architectures. Similarly, multiprocessor kernels for the "PPro"
-         architecture may not work on all Pentium based boards.
-
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 
          See also the <file:Documentation/smp.txt>,
-         <file:Documentation/i386/IO-APIC.txt>,
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.tldp.org/docs.html#howto>.
 
@@ -137,19 +164,10 @@ config NR_CPUS
 
 source "drivers/cpufreq/Kconfig"
 
-config CPU_FREQ_TABLE
-       tristate "CPU frequency table helpers"
-       depends on CPU_FREQ
-       default y
-       help
-         Many CPUFreq drivers use these helpers, so only say N here if
-        the CPUFreq driver of your choice doesn't need these helpers.
-
-        If in doubt, say Y.
-
 config US3_FREQ
        tristate "UltraSPARC-III CPU Frequency driver"
-       depends on CPU_FREQ_TABLE
+       depends on CPU_FREQ
+       select CPU_FREQ_TABLE
        help
          This adds the CPUFreq driver for UltraSPARC-III processors.
 
@@ -159,7 +177,8 @@ config US3_FREQ
 
 config US2E_FREQ
        tristate "UltraSPARC-IIe CPU Frequency driver"
-       depends on CPU_FREQ_TABLE
+       depends on CPU_FREQ
+       select CPU_FREQ_TABLE
        help
          This adds the CPUFreq driver for UltraSPARC-IIe processors.
 
@@ -186,6 +205,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 choice
        prompt "SPARC64 Huge TLB Page Size"
        depends on HUGETLB_PAGE
@@ -195,9 +218,11 @@ config HUGETLB_PAGE_SIZE_4MB
        bool "4MB"
 
 config HUGETLB_PAGE_SIZE_512K
+       depends on !SPARC64_PAGE_SIZE_4MB
        bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
+       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K
        bool "64K"
 
 endchoice
@@ -556,7 +581,7 @@ config DRM
 
 config DRM_FFB
        tristate "Creator/Creator3D"
-       depends on DRM
+       depends on DRM && BROKEN
        help
          Choose this option if you have one of Sun's Creator3D-based graphics
          and frame buffer cards.  Product page at
@@ -591,6 +616,8 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/infiniband/Kconfig"
+
 source "drivers/char/watchdog/Kconfig"
 
 source "arch/sparc64/oprofile/Kconfig"