diff --git a/init/Kconfig b/init/Kconfig index 282009cb426c95022bb68dc3c139272eb4251fe3..998f1812ea1f4302467c26d721efb40ad9dcc5a1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -991,6 +991,7 @@ config CFS_BANDWIDTH config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on CGROUP_SCHED + depends on !PREEMPT_RT default n help This feature lets you explicitly allocate real CPU bandwidth @@ -1989,6 +1990,7 @@ choice config SLAB bool "SLAB" + depends on !PREEMPT_RT select HAVE_HARDENED_USERCOPY_ALLOCATOR help The regular slab allocator that is established and known to work @@ -2009,6 +2011,7 @@ config SLUB config SLOB depends on EXPERT bool "SLOB (Simple Allocator)" + depends on !PREEMPT_RT help SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but diff --git a/net/Kconfig b/net/Kconfig index 71e0ddd5c726c4dd7f946552984473b62d885107..0a73d0c2fe4994dc3510a62fdc86bee1b0e1cba3 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -283,7 +283,7 @@ config CGROUP_NET_CLASSID config NET_RX_BUSY_POLL bool - default y + default y if !PREEMPT_RT config BQL bool