[PATCH] fix MAX_USER_RT_PRIO and MAX_RT_PRIO

[linux-2.6] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ce13ad689d191701698d9fa3dbd301c6fdb4d574..cbb3e0cef93afa009b631d5dba79b1cdab790668 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -46,6 +46,14 @@ config GENERIC_IOMAP
        bool
        default y
 
        bool
        default y
 

+config SCHED_NO_NO_OMIT_FRAME_POINTER
+       bool
+       default y
+
+config IA64_UNCACHED_ALLOCATOR
+       bool
+       select GENERIC_ALLOCATOR
+

 choice
        prompt "System type"
        default IA64_GENERIC
 choice
        prompt "System type"
        default IA64_GENERIC


@@ -153,6 +161,8 @@ config IA64_PAGE_SIZE_64KB
 
 endchoice
 
 
 endchoice
 

+source kernel/Kconfig.hz
+

 config IA64_BRL_EMU
        bool
        depends on ITANIUM
 config IA64_BRL_EMU
        bool
        depends on ITANIUM


@@ -189,7 +199,7 @@ config HOLES_IN_ZONE
        bool
        default y if VIRTUAL_MEM_MAP
 
        bool
        default y if VIRTUAL_MEM_MAP
 

-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE

        bool "Discontiguous memory support"
        depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
        bool "Discontiguous memory support"
        depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA


@@ -210,16 +220,9 @@ config IOSAPIC
        depends on !IA64_HP_SIM
        default y
 
        depends on !IA64_HP_SIM
        default y
 

-config IA64_SGI_SN_SIM
-       bool "SGI Medusa Simulator Support"
-       depends on IA64_SGI_SN2
-       help
-         If you are compiling a kernel that will run under SGI's IA-64
-         simulator (Medusa) then say Y, otherwise say N.
-

 config IA64_SGI_SN_XP
        tristate "Support communication between SGI SSIs"
 config IA64_SGI_SN_XP
        tristate "Support communication between SGI SSIs"

-       depends on MSPEC
+       select IA64_UNCACHED_ALLOCATOR

        help
          An SGI machine can be divided into multiple Single System
          Images which act independently of each other and have
        help
          An SGI machine can be divided into multiple Single System
          Images which act independently of each other and have


@@ -292,6 +295,8 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 

+source "mm/Kconfig"
+

 config HAVE_DEC_LOCK
        bool
        depends on (SMP || PREEMPT)
 config HAVE_DEC_LOCK
        bool
        depends on (SMP || PREEMPT)


@@ -411,6 +416,8 @@ endmenu
 
 endif
 
 
 endif
 

+source "net/Kconfig"
+

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