enable DEBUG_PREEMPT/SLUB_DEBUG only in debug build

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 1470db323036b40fa0255d9d61d463c9dbfcf8ce..eb63461c084655fef3c03c49e4114f2cb5d6cff4 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -13544,7 +13544,6 @@ TEST_LOCKUP all=m
 SCHED_DEBUG all=n
 SCHEDSTATS all=n
 DEBUG_TIMEKEEPING all=n
-DEBUG_PREEMPT all=y
 PROVE_LOCKING all=n
 LOCK_STAT all=n
 DEBUG_RT_MUTEXES all=n

diff --git a/kernel.spec b/kernel.spec
index 433db5405936956bd54ff8f2893fd3c4e64b6992..613d0e9a0fd410134d3be60448c648a749faf8c1 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -811,10 +811,12 @@ BuildConfig() {
                LOCALVERSION="-%{localversion}"
 
 %if 0%{?debug:1}
-               CONFIG_DEBUG_SLAB=y
-               CONFIG_DEBUG_SLAB_LEAK=y
+               CONFIG_SLUB_DEBUG=y
                CONFIG_DEBUG_PREEMPT=y
                CONFIG_RT_DEADLOCK_DETECT=y
+%else
+               CONFIG_SLUB_DEBUG=n
+               CONFIG_DEBUG_PREEMPT=n
 %endif
 
 %if %{without ipv6}