55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From 8e51870016e78cb0cf912195169bce466be05fb3 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 24 Jul 2011 12:11:43 +0200
|
|
Subject: [PATCH 261/278] kconfig-disable-a-few-options-rt.patch
|
|
|
|
Disable stuff which is known to have issues on RT
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/Kconfig | 1 +
|
|
drivers/net/Kconfig | 1 +
|
|
mm/Kconfig | 2 +-
|
|
3 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/Kconfig b/arch/Kconfig
|
|
index 4b0669c..73fc7cd 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 654a5e9..0f5149d 100644
|
|
--- a/drivers/net/Kconfig
|
|
+++ b/drivers/net/Kconfig
|
|
@@ -154,6 +154,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 011b110..0526445 100644
|
|
--- a/mm/Kconfig
|
|
+++ b/mm/Kconfig
|
|
@@ -307,7 +307,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
|
|
--
|
|
1.7.10
|
|
|