summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-01-16 15:07:12 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-01-16 15:07:12 -0500
commit79b57ad1203fa5dc830da3a0d6027bc59d426f1d (patch)
treef1697fe405e73699277ac6329db86f67dcb4754a
parent8a6c714a8c5421fc5985f2a14bc75bee3e381624 (diff)
downloadkernel-79b57ad1203fa5dc830da3a0d6027bc59d426f1d.tar.gz
kernel-79b57ad1203fa5dc830da3a0d6027bc59d426f1d.tar.xz
kernel-79b57ad1203fa5dc830da3a0d6027bc59d426f1d.zip
Default to SLUB_DEBUG_ON not set
We can flip it on at runtime if we need to, and this should help a performance hit people have been seeing for a while now. We'll enable it manually for merge window kernels. https://lists.fedoraproject.org/pipermail/kernel/2014-January/004810.html
-rw-r--r--Makefile1
-rw-r--r--Makefile.release1
-rw-r--r--config-debug2
-rw-r--r--config-generic1
-rw-r--r--config-nodebug2
5 files changed, 1 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 2a9cc15fb..23f8c4861 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ extremedebug:
@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
debug:
- @perl -pi -e 's/# CONFIG_SLUB_DEBUG_ON is not set/CONFIG_SLUB_DEBUG_ON=y/' config-nodebug
@perl -pi -e 's/# CONFIG_LOCK_STAT is not set/CONFIG_LOCK_STAT=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index 4cd25f2d0..bac0e4dbb 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -6,7 +6,6 @@
# Anything that changes kernel.spec itself should go in the main Makefile.
config-release:
- @perl -pi -e 's/CONFIG_SLUB_DEBUG_ON=y/# CONFIG_SLUB_DEBUG_ON is not set/' config-nodebug
@perl -pi -e 's/CONFIG_LOCK_STAT=y/# CONFIG_LOCK_STAT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 8000b4e86..e22532600 100644
--- a/config-debug
+++ b/config-debug
@@ -26,8 +26,6 @@ CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAIL_IO_TIMEOUT=y
CONFIG_FAIL_MMC_REQUEST=y
-CONFIG_SLUB_DEBUG_ON=y
-
CONFIG_LOCK_STAT=y
CONFIG_DEBUG_STACK_USAGE=y
diff --git a/config-generic b/config-generic
index 67b0d2840..9a4bb0d53 100644
--- a/config-generic
+++ b/config-generic
@@ -72,6 +72,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_SLUB=y
CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SLUB_STATS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_AD525X_DPOT is not set
# CONFIG_ATMEL_PWM is not set
diff --git a/config-nodebug b/config-nodebug
index be9e1aa85..9d4b2e91f 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -26,8 +26,6 @@ CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAIL_IO_TIMEOUT=y
CONFIG_FAIL_MMC_REQUEST=y
-CONFIG_SLUB_DEBUG_ON=y
-
CONFIG_LOCK_STAT=y
CONFIG_DEBUG_STACK_USAGE=y