diff options
-rw-r--r-- | arch/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/Kconfig | 1 | ||||
-rw-r--r-- | mm/Kconfig | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 684eb5af439d..417ff4c6fc14 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -6,6 +6,7 @@ config OPROFILE tristate "OProfile system profiling" depends on PROFILING depends on HAVE_OPROFILE + depends on !PREEMPT_RT_FULL select RING_BUFFER select RING_BUFFER_ALLOW_SWAP help diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b98285446a5a..8b53d9287b8a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -156,6 +156,7 @@ config MACVTAP config NETCONSOLE tristate "Network console logging support" + depends on !PREEMPT_RT_FULL ---help--- If you want to log kernel messages over the network, enable this. See <file:Documentation/networking/netconsole.txt> for details. diff --git a/mm/Kconfig b/mm/Kconfig index e338407f1225..096f43635264 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -313,7 +313,7 @@ config NOMMU_INITIAL_TRIM_EXCESS config TRANSPARENT_HUGEPAGE bool "Transparent Hugepage Support" - depends on X86 && MMU + depends on X86 && MMU && !PREEMPT_RT_FULL select COMPACTION help Transparent Hugepages allows the kernel to use huge pages and |