summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-08-29 15:57:50 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2016-08-29 15:57:50 -0400
commit10305a7c2b77752fb67d8457a557ff044ebd9c44 (patch)
tree341fea1eb7f812ac219ec4d50c6aab77b941148b
parent3e2316bfdad9eaf86f56ec94d24f601597b6e674 (diff)
download4.8-rt-patches-10305a7c2b77752fb67d8457a557ff044ebd9c44.tar.gz
kconfig: trivial refresh
-rw-r--r--patches/kconfig-disable-a-few-options-rt.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/patches/kconfig-disable-a-few-options-rt.patch b/patches/kconfig-disable-a-few-options-rt.patch
index bf0c195d4ba80f..538b5a3c198419 100644
--- a/patches/kconfig-disable-a-few-options-rt.patch
+++ b/patches/kconfig-disable-a-few-options-rt.patch
@@ -1,15 +1,14 @@
-Subject: kconfig: Disable config options which are not RT compatible
+From 53cd6fa3812a9e218ba1042e91d2fd17b1f19a6c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 24 Jul 2011 12:11:43 +0200
+Subject: [PATCH] kconfig: Disable config options which are not RT compatible
Disable stuff which is known to have issues on RT
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
----
- arch/Kconfig | 1 +
- mm/Kconfig | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
+diff --git a/arch/Kconfig b/arch/Kconfig
+index 4f3a778ce824..cd99e72eaf27 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -9,6 +9,7 @@ config OPROFILE
@@ -20,14 +19,19 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
select RING_BUFFER
select RING_BUFFER_ALLOW_SWAP
help
+diff --git a/mm/Kconfig b/mm/Kconfig
+index 2664c118b5d2..262c487ebc93 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -391,7 +391,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
+@@ -402,7 +402,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
config TRANSPARENT_HUGEPAGE
bool "Transparent Hugepage Support"
- depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
select COMPACTION
+ select RADIX_TREE_MULTIORDER
help
- Transparent Hugepages allows the kernel to use huge pages and
+--
+2.5.0
+