Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index b9c0f307a8fa7ee9b8e866b0416c0764b88d7630..e6ff30266542a79b8909a5ef5f4e7991e58e16ca 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -277,7 +277,9 @@ config HIGHMEM
 
 config KERNEL_STACK_ORDER
        int "Kernel stack size order"
-       default 2
+       default 1 if 64BIT
+       range 1 10 if 64BIT
+       default 0 if !64BIT
        help
        This option determines the size of UML kernel stacks.  They will
        be 1 << order pages.  The default is OK unless you're running Valgrind