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 d648a48..93e3d12 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -6,8 +6,7 @@
 mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC
 mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC

-       bool
-       default y
+       def_bool y

        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,


@@ -15,27 +14,34 @@ config PARISC
          at <http://www.parisc-linux.org/>.
 
 config MMU
          at <http://www.parisc-linux.org/>.
 
 config MMU

-       bool
-       default y
+       def_bool y

 
 config STACK_GROWSUP
 
 config STACK_GROWSUP

-       bool
-       default y
+       def_bool y
+
+config RWSEM_GENERIC_SPINLOCK
+       def_bool y

 
 

-config UID16
+config RWSEM_XCHGADD_ALGORITHM

        bool
 
        bool
 

-config RWSEM_GENERIC_SPINLOCK
+config GENERIC_FIND_NEXT_BIT

        bool
        default y
 
        bool
        default y
 

-config RWSEM_XCHGADD_ALGORITHM
+config GENERIC_HWEIGHT

        bool
        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
 


@@ -49,6 +55,14 @@ config GENERIC_IRQ_PROBE
 config PM
        bool
 
 config PM
        bool
 

+config ISA_DMA_API
+       bool
+
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       depends on BROKEN
+       default y
+

 source "init/Kconfig"
 
 
 source "init/Kconfig"
 
 


@@ -111,7 +125,7 @@ config PREFETCH
        def_bool y
        depends on PA8X00
 
        def_bool y
        depends on PA8X00
 

-config PARISC64
+config 64BIT

        bool "64-bit kernel"
        depends on PA8X00
        help
        bool "64-bit kernel"
        depends on PA8X00
        help


@@ -124,8 +138,36 @@ config PARISC64
          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.
 

-config 64BIT
-       def_bool PARISC64
+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"
 
 config SMP
        bool "Symmetric multi-processing support"


@@ -151,28 +193,37 @@ 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
 
 config COMPAT

-       bool
-       depends on PARISC64
-       default y
+       def_bool y
+       depends on 64BIT

 
 config HPUX
        bool "Support for HP-UX binaries"
 
 config HPUX
        bool "Support for HP-UX binaries"

-       depends on !PARISC64
+       depends on !64BIT

 
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"
 
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"


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

+source "net/Kconfig"
+

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