config: Remove SLAB (use SLUB) and use CONFIG_PREEMPT_VOLUNTARY=y

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/linux.config b/linux.config
index 0a9c0d47868bc97e991f12e367917591070ef130..8de95c6fccb2e3860b419464401d19d37bf6115e 100644 (file)
--- a/linux.config
+++ b/linux.config
@@ -795,9 +795,10 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 
 # CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 
-CONFIG_DEBUG_SHIRQ=y
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 
@@ -805,8 +806,6 @@ CONFIG_DEBUG_ATOMIC_SLEEP=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_SCHED_AUTOGROUP=y
 
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
 # CONFIG_TRACEPOINTS is not set
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536