Fix nodebug kernels, CPUMASK_OFFSTACK is always selected with MAXSMP

13 files changed, 16 insertions, 14 deletions

diff --git a/baseconfig/CONFIG_CPUMASK_OFFSTACK b/baseconfig/CONFIG_CPUMASK_OFFSTACK
index 6e4f61ead..aa9b7f323 100644
--- a/baseconfig/CONFIG_CPUMASK_OFFSTACK
+++ b/baseconfig/CONFIG_CPUMASK_OFFSTACK
@@ -1 +1 @@
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
diff --git a/debugconfig/CONFIG_CPUMASK_OFFSTACK b/debugconfig/CONFIG_CPUMASK_OFFSTACK
deleted file mode 100644
index aa9b7f323..000000000
--- a/debugconfig/CONFIG_CPUMASK_OFFSTACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPUMASK_OFFSTACK=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c33da88ca..f90863fbc 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -903,7 +903,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 56aa69084..8296f17b8 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -933,7 +933,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_SW_DOMAIN_PAN is not set
 CONFIG_CPU_THERMAL=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3c354b26b..3d1c94c11 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -959,7 +959,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f51a2a39d..94cf3c0d9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -789,7 +789,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 7b81384a7..69e4c0aa3 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -789,7 +789,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 31b17d1db..6cfd9463d 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -788,7 +788,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 368fd3342..0235c348e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -743,7 +743,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index bf35338c1..072e3014f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -743,7 +743,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 07d4fcc91..77f04da58 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -739,7 +739,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 # CONFIG_CPU_IDLE is not set
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 63e064ac5..707e657ec 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -796,7 +796,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPUMASK_OFFSTACK is not set
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
diff --git a/kernel.spec b/kernel.spec
index 4cf959690..11f639d95 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -125,7 +125,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -2154,6 +2154,9 @@ fi
 #
 #
 %changelog
+* Tue Jan 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git0.2
+- Disable debugging options.
+
 * Mon Jan 02 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git0.1
 - Linux v4.10-rc2