kernel: Update to 4.1.7

[ipfire-3.x.git] / kernel / config-generic

diff --git a/kernel/config-generic b/kernel/config-generic
index bba9abea73c1b0580726e8745aa7459a83e8ddbe..d0a66e15dacde3dcbee125bcc29d945b7e343fdb 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -146,10 +146,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 # CONFIG_PROFILING is not set
@@ -4632,7 +4629,6 @@ CONFIG_DEBUG_KERNEL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set