linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a6309b8..eb58ca4 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -34,10 +34,6 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
-config AUDIT_ARCH
-       bool
-       default y
-
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@ -91,10 +87,6 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
-config GENERIC_HARDIRQS
-       bool
-       default y
-
 menu "General machine setup"
 
 config SMP
@@ -170,14 +162,6 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
-config GENERIC_FIND_NEXT_BIT
-       bool
-       default y
-
-config GENERIC_HWEIGHT
-       bool
-       default y if !ULTRA_HAS_POPULATION_COUNT
-
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -191,29 +175,17 @@ config HUGETLB_PAGE_SIZE_4MB
        bool "4MB"
 
 config HUGETLB_PAGE_SIZE_512K
-       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
+       depends on !SPARC64_PAGE_SIZE_4MB
        bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
-       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB
+       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
        bool "64K"
 
 endchoice
 
 endmenu
 
-config ARCH_SELECT_MEMORY_MODEL
-       def_bool y
-
-config ARCH_SPARSEMEM_ENABLE
-       def_bool y
-
-config ARCH_SPARSEMEM_DEFAULT
-       def_bool y
-
-config LARGE_ALLOCS
-       def_bool y
-
 source "mm/Kconfig"
 
 config GENERIC_ISA_DMA
@@ -338,7 +310,7 @@ config COMPAT
        default y
 
 config BINFMT_ELF32
-       bool "Kernel support for 32-bit ELF binaries"
+       tristate "Kernel support for 32-bit ELF binaries"
        depends on SPARC32_COMPAT
        help
          This allows you to run 32-bit Linux/ELF binaries on your Ultra.
@@ -378,15 +350,6 @@ config SOLARIS_EMUL
 
 endmenu
 
-config SCHED_SMT
-       bool "SMT (Hyperthreading) scheduler support"
-       depends on SMP
-       default y
-       help
-         SMT scheduler support improves the CPU scheduler's decision making
-         when dealing with UltraSPARC cpus at a cost of slightly increased
-         overhead in some places. If unsure say N here.
-
 config CMDLINE_BOOL
        bool "Default bootloader kernel arguments"