summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-09-05 15:56:14 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2016-09-05 15:56:14 -0400
commiteee2ca0e9a173a299d13fbcb126292f9e3ac273e (patch)
tree72ff58e761e224b0883ff1b76dde4ebb23d4c8e4
parentf286ddb278f25ee6504f2d9bf0dc41a8dbbc67bd (diff)
download4.8-rt-patches-eee2ca0e9a173a299d13fbcb126292f9e3ac273e.tar.gz
init: Kconfig refresh
-rw-r--r--patches/mm-disable-sloub-rt.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/patches/mm-disable-sloub-rt.patch b/patches/mm-disable-sloub-rt.patch
index 9f68cc881fc0b8..a215f09f5565b3 100644
--- a/patches/mm-disable-sloub-rt.patch
+++ b/patches/mm-disable-sloub-rt.patch
@@ -1,27 +1,26 @@
+From f1b555f2b9108a36515a988df5d785e9ab865b62 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 3 Jul 2009 08:44:03 -0500
-Subject: mm: Allow only slub on RT
+Subject: [PATCH] mm: Allow only slub on RT
Disable SLAB and SLOB on -RT. Only SLUB is adopted to -RT needs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
----
- init/Kconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
+diff --git a/init/Kconfig b/init/Kconfig
+index cac3f096050d..42bec8587f4c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1718,6 +1718,7 @@ choice
-
+@@ -1762,6 +1762,7 @@ choice
config SLAB
bool "SLAB"
+ select HAVE_HARDENED_USERCOPY_ALLOCATOR
+ depends on !PREEMPT_RT_FULL
help
The regular slab allocator that is established and known to work
well in all environments. It organizes cache hot objects in
-@@ -1736,6 +1737,7 @@ config SLUB
+@@ -1781,6 +1782,7 @@ config SLUB
config SLOB
depends on EXPERT
bool "SLOB (Simple Allocator)"
@@ -29,3 +28,6 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
help
SLOB replaces the stock allocator with a drastically simpler
allocator. SLOB is generally more space efficient but
+--
+2.5.0
+