linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 232a064..5284537 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -25,14 +25,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
-config GENERIC_FIND_NEXT_BIT
-       bool
-       default y
-
-config GENERIC_HWEIGHT
-       bool
-       default y
-
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -51,10 +43,6 @@ config GENERIC_HARDIRQS
 config GENERIC_IRQ_PROBE
        def_bool y
 
-config IRQ_PER_CPU
-       bool
-       default y
-
 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
        bool
@@ -142,37 +130,6 @@ config 64BIT
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
-choice
-       prompt "Kernel page size"
-       default PARISC_PAGE_SIZE_4KB  if !64BIT
-       default PARISC_PAGE_SIZE_4KB  if 64BIT
-#      default PARISC_PAGE_SIZE_16KB if 64BIT
-
-config PARISC_PAGE_SIZE_4KB
-       bool "4KB"
-       help
-         This lets you select the page size of the kernel.  For best
-         performance, a page size of 16KB is recommended.  For best
-         compatibility with 32bit applications, a page size of 4KB should be
-         selected (the vast majority of 32bit binaries work perfectly fine
-         with a larger page size).
-
-         4KB                For best 32bit compatibility
-         16KB               For best performance
-         64KB               For best performance, might give more overhead.
-
-         If you don't know what to do, choose 4KB.
-
-config PARISC_PAGE_SIZE_16KB
-       bool "16KB (EXPERIMENTAL)"
-       depends on PA8X00 && EXPERIMENTAL
-
-config PARISC_PAGE_SIZE_64KB
-       bool "64KB (EXPERIMENTAL)"
-       depends on PA8X00 && EXPERIMENTAL
-
-endchoice
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -212,15 +169,14 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 
-config NODES_SHIFT
-       int
-       default "3"
-       depends on NEED_MULTIPLE_NODES
-
-source "kernel/Kconfig.preempt"
 source "kernel/Kconfig.hz"
 source "mm/Kconfig"
 
+config PREEMPT
+       bool
+#      bool "Preemptible Kernel"
+       default n
+
 config COMPAT
        def_bool y
        depends on 64BIT