Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e2ece5d..93e3d12 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -19,19 +19,29 @@ config MMU
 config STACK_GROWSUP
        def_bool y
 
 config STACK_GROWSUP
        def_bool y
 

-config UID16
-       bool
-

 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
 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
 
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 

+config TIME_LOW_RES
+       bool
+       depends on SMP
+       default y
+

 config GENERIC_ISA_DMA
        bool
 
 config GENERIC_ISA_DMA
        bool
 


@@ -47,6 +57,10 @@ config PM
 
 config ISA_DMA_API
        bool
 
 config ISA_DMA_API
        bool

+
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       depends on BROKEN

        default y
 
 source "init/Kconfig"
        default y
 
 source "init/Kconfig"


@@ -124,6 +138,37 @@ config 64BIT
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
          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---
 config SMP
        bool "Symmetric multi-processing support"
        ---help---


@@ -148,19 +193,29 @@ config HOTPLUG_CPU
        default y if SMP
        select HOTPLUG
 
        default y if SMP
        select HOTPLUG
 

-config DISCONTIGMEM
-       bool "Discontiguous memory support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       help
-         Say Y to support efficient handling of discontiguous physical memory,
-         for architectures which are either NUMA (Non-Uniform Memory Access)
-         or have huge holes in the physical address space for other reasons.
-         See <file:Documentation/vm/numa> for more.
+config ARCH_SELECT_MEMORY_MODEL
+       def_bool y
+       depends on 64BIT

 
 

-config PREEMPT
-       bool
-#      bool "Preemptible Kernel"
-       default n
+config ARCH_DISCONTIGMEM_ENABLE
+       def_bool y
+       depends on 64BIT
+
+config ARCH_FLATMEM_ENABLE
+       def_bool y
+
+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 COMPAT
        def_bool y
 
 config COMPAT
        def_bool y


@@ -188,6 +243,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
 
 endmenu
 

+source "net/Kconfig"
+

 source "drivers/Kconfig"
 
 source "fs/Kconfig"
 source "drivers/Kconfig"
 
 source "fs/Kconfig"