summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-24 12:11:43 +0200
committerClark Williams <williams@redhat.com>2011-11-14 11:02:10 -0600
commit5c2313a8422c94f77b6310e88a6ffc1a98b5b63c (patch)
treeef787f6948cf8c9275d955dfa06e6f734615030e
parent2b1bdcd6b43d17c372ff4736f02ed08f09136bd9 (diff)
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>
-rw-r--r--arch/Kconfig1
-rw-r--r--drivers/net/Kconfig1
-rw-r--r--mm/Kconfig2
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 4b0669cbb3b0..73fc7cd51582 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 583f66cd5bbd..a3f393a830ff 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 011b110365c8..0526445c9b35 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