[PATCH] Generic ioremap_page_range: sh conversion

[linux-2.6-omap-h63xx.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b216ca659cdff5876e8cbb8f04be03395fc03cc3..45e47bfb68a9912a0d331c37fa1b0fc10da26776 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -22,6 +22,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
        bool
        default y
 

+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+

 config GENERIC_HWEIGHT
        bool
        default y
 config GENERIC_HWEIGHT
        bool
        default y


@@ -30,8 +38,8 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

-config GENERIC_BUST_SPINLOCK
-       bool
+config GENERIC_TIME
+       def_bool y

 
 mainmenu "Linux Kernel Configuration"
 
 
 mainmenu "Linux Kernel Configuration"
 


@@ -51,6 +59,10 @@ config 64BIT
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 

+config 32BIT
+       bool
+       default y if !64BIT
+

 config SMP
        bool "Symmetric multi-processing support"
        ---help---
 config SMP
        bool "Symmetric multi-processing support"
        ---help---


@@ -149,6 +161,14 @@ config MARCH_Z990
          This will be slightly faster but does not work on
          older machines such as the z900.
 
          This will be slightly faster but does not work on
          older machines such as the z900.
 

+config MARCH_Z9_109
+       bool "IBM System z9"
+       help
+         Select this to enable optimizations for IBM System z9-109, IBM
+         System z9 Enterprise Class (z9 EC), and IBM System z9 Business
+         Class (z9 BC). The kernel will be slightly faster but will not
+         work on older machines such as the z990, z890, z900, and z800.
+

 endchoice
 
 config PACK_STACK
 endchoice
 
 config PACK_STACK


@@ -166,7 +186,7 @@ config PACK_STACK
 
 config SMALL_STACK
        bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
 
 config SMALL_STACK
        bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"

-       depends on PACK_STACK
+       depends on PACK_STACK && !LOCKDEP

        help
          If you say Y here and the compiler supports the -mkernel-backchain
          option the kernel will use a smaller kernel stack size. For 31 bit
        help
          If you say Y here and the compiler supports the -mkernel-backchain
          option the kernel will use a smaller kernel stack size. For 31 bit