usermodehelper: Tidy up waiting

[safe/jmp/linux-2.6] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index fc5755d..3d73545 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -25,10 +25,23 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -37,13 +50,14 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config TIME_LOW_RES
+config GENERIC_TIME
        bool
-       depends on SMP
        default y
 
-config GENERIC_ISA_DMA
+config TIME_LOW_RES
        bool
+       depends on SMP
+       default y
 
 config GENERIC_HARDIRQS
        def_bool y
@@ -51,6 +65,10 @@ 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
@@ -123,7 +141,7 @@ config PA11
 
 config PREFETCH
        def_bool y
-       depends on PA8X00
+       depends on PA8X00 || PA7200
 
 config 64BIT
        bool "64-bit kernel"
@@ -138,16 +156,36 @@ config 64BIT
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
-config HPPA_IOREMAP
-       bool "Enable IOREMAP functionality (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       default n
+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
-         Enable this option if you want to enable real IOREMAPPING on PA-RISC.
-         Currently we just "simulate" I/O remapping, and enabling this option
-         will just crash your machine.
+         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.
 
-         Say N here, unless you are a real PA-RISC Linux kernel hacker.
+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"
@@ -188,14 +226,15 @@ 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