diff mbox series

[1/1] UBUNTU: [Config] lowlatency: turn off RT_GROUP_SCHED

Message ID 20200417112946.51881-2-paolo.pisati@canonical.com
State New
Headers show
Series lowlatency: turn off | expand

Commit Message

Paolo Pisati April 17, 2020, 11:29 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1873315

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/config/amd64/config.flavour.generic    | 1 +
 debian.master/config/amd64/config.flavour.lowlatency | 1 +
 debian.master/config/annotations                     | 5 ++++-
 debian.master/config/arm64/config.common.arm64       | 1 +
 debian.master/config/armhf/config.common.armhf       | 1 +
 debian.master/config/config.common.ubuntu            | 1 -
 debian.master/config/i386/config.common.i386         | 1 +
 debian.master/config/ppc64el/config.common.ppc64el   | 1 +
 debian.master/config/s390x/config.common.s390x       | 1 +
 9 files changed, 11 insertions(+), 2 deletions(-)

Comments

Stefan Bader April 20, 2020, 2:22 p.m. UTC | #1
On 17.04.20 13:29, Paolo Pisati wrote:
> BugLink: https://bugs.launchpad.net/bugs/1873315
> 
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/config/amd64/config.flavour.generic    | 1 +
>  debian.master/config/amd64/config.flavour.lowlatency | 1 +
>  debian.master/config/annotations                     | 5 ++++-
>  debian.master/config/arm64/config.common.arm64       | 1 +
>  debian.master/config/armhf/config.common.armhf       | 1 +
>  debian.master/config/config.common.ubuntu            | 1 -
>  debian.master/config/i386/config.common.i386         | 1 +
>  debian.master/config/ppc64el/config.common.ppc64el   | 1 +
>  debian.master/config/s390x/config.common.s390x       | 1 +
>  9 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
> index d1662374ea94..cc5ca64ba034 100644
> --- a/debian.master/config/amd64/config.flavour.generic
> +++ b/debian.master/config/amd64/config.flavour.generic
> @@ -8,3 +8,4 @@ CONFIG_HZ_250=y
>  # CONFIG_LATENCYTOP is not set
>  # CONFIG_PREEMPT is not set
>  CONFIG_PREEMPT_VOLUNTARY=y
> +CONFIG_RT_GROUP_SCHED=y
> diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
> index 814348dc984b..5f438aac9f49 100644
> --- a/debian.master/config/amd64/config.flavour.lowlatency
> +++ b/debian.master/config/amd64/config.flavour.lowlatency
> @@ -8,3 +8,4 @@ CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
>  CONFIG_LATENCYTOP=y
>  CONFIG_PREEMPT=y
>  # CONFIG_PREEMPT_VOLUNTARY is not set
> +# CONFIG_RT_GROUP_SCHED is not set
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index b0921ccdbbac..dd6481141e9f 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -10390,9 +10390,12 @@ CONFIG_CGROUP_DEBUG                             policy<{'amd64': 'n', 'arm64': '
>  CONFIG_CGROUP_SCHED                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_FAIR_GROUP_SCHED                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_CFS_BANDWIDTH                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -CONFIG_RT_GROUP_SCHED                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> +CONFIG_RT_GROUP_SCHED                           policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'n', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_UCLAMP_TASK_GROUP                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
>  
> +CONFIG_RT_GROUP_SCHED                           note<LP#1284731>
> +CONFIG_RT_GROUP_SCHED                           note<LP#1873315>
> +
>  # Menu: General setup >> IRQ subsystem
>  CONFIG_IRQ_FORCED_THREADING_DEFAULT             policy<{'amd64-generic': 'n', 'amd64-lowlatency': 'y', 'arm64': 'n', 'armhf': 'n', 'i386-generic': 'n', 'i386-lowlatency': 'y', 'ppc64el': 'n'}>
>  CONFIG_SPARSE_IRQ                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index af9d355db654..065a0af8c2df 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -505,6 +505,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_PCF8523=m
>  CONFIG_RTC_DRV_PL031=m
>  CONFIG_RTC_DRV_TWL4030=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
> index ed4d48d79036..5b3e923157b3 100644
> --- a/debian.master/config/armhf/config.common.armhf
> +++ b/debian.master/config/armhf/config.common.armhf
> @@ -482,6 +482,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=m
>  CONFIG_RTC_DRV_PL031=y
>  CONFIG_RTC_DRV_TWL4030=y
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=y
>  # CONFIG_SCHED_SMT is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 10400ef5ec7b..f502f2bdfa07 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -8291,7 +8291,6 @@ CONFIG_RTW88_DEBUG=y
>  CONFIG_RTW88_DEBUGFS=y
>  CONFIG_RTW88_PCI=m
>  # CONFIG_RTW88_REGD_USER_REG_HINTS is not set
> -CONFIG_RT_GROUP_SCHED=y
>  CONFIG_RT_MUTEXES=y
>  CONFIG_RUNTIME_TESTING_MENU=y
>  CONFIG_RWSEM_SPIN_ON_OWNER=y
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 150b9e14147a..d5fb1d3dbd03 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -480,6 +480,7 @@ CONFIG_ROMFS_FS=m
>  CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=y
>  CONFIG_RTC_DRV_PCF8523=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index e3c13275ffc9..c590267e3eb8 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -486,6 +486,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=m
>  CONFIG_RTC_DRV_PCF8523=m
>  CONFIG_RTC_DRV_TWL4030=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 6573f80165b1..9c8bb6be7ca1 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -444,6 +444,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
>  # CONFIG_RMI4_CORE is not set
>  # CONFIG_ROMFS_FS is not set
>  # CONFIG_RPMSG_VIRTIO is not set
> +CONFIG_RT_GROUP_SCHED=y
>  # CONFIG_S2IO is not set
>  CONFIG_SCHED_SMT=y
>  # CONFIG_SCSI_3W_9XXX is not set
>
Kamal Mostafa April 20, 2020, 2:23 p.m. UTC | #2
Acked-by: Kamal Mostafa <kamal@canonical.com>

 -Kamal

On Fri, Apr 17, 2020 at 01:29:46PM +0200, Paolo Pisati wrote:
> BugLink: https://bugs.launchpad.net/bugs/1873315
> 
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> ---
>  debian.master/config/amd64/config.flavour.generic    | 1 +
>  debian.master/config/amd64/config.flavour.lowlatency | 1 +
>  debian.master/config/annotations                     | 5 ++++-
>  debian.master/config/arm64/config.common.arm64       | 1 +
>  debian.master/config/armhf/config.common.armhf       | 1 +
>  debian.master/config/config.common.ubuntu            | 1 -
>  debian.master/config/i386/config.common.i386         | 1 +
>  debian.master/config/ppc64el/config.common.ppc64el   | 1 +
>  debian.master/config/s390x/config.common.s390x       | 1 +
>  9 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
> index d1662374ea94..cc5ca64ba034 100644
> --- a/debian.master/config/amd64/config.flavour.generic
> +++ b/debian.master/config/amd64/config.flavour.generic
> @@ -8,3 +8,4 @@ CONFIG_HZ_250=y
>  # CONFIG_LATENCYTOP is not set
>  # CONFIG_PREEMPT is not set
>  CONFIG_PREEMPT_VOLUNTARY=y
> +CONFIG_RT_GROUP_SCHED=y
> diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
> index 814348dc984b..5f438aac9f49 100644
> --- a/debian.master/config/amd64/config.flavour.lowlatency
> +++ b/debian.master/config/amd64/config.flavour.lowlatency
> @@ -8,3 +8,4 @@ CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
>  CONFIG_LATENCYTOP=y
>  CONFIG_PREEMPT=y
>  # CONFIG_PREEMPT_VOLUNTARY is not set
> +# CONFIG_RT_GROUP_SCHED is not set
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index b0921ccdbbac..dd6481141e9f 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -10390,9 +10390,12 @@ CONFIG_CGROUP_DEBUG                             policy<{'amd64': 'n', 'arm64': '
>  CONFIG_CGROUP_SCHED                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_FAIR_GROUP_SCHED                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_CFS_BANDWIDTH                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -CONFIG_RT_GROUP_SCHED                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> +CONFIG_RT_GROUP_SCHED                           policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'n', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_UCLAMP_TASK_GROUP                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
>  
> +CONFIG_RT_GROUP_SCHED                           note<LP#1284731>
> +CONFIG_RT_GROUP_SCHED                           note<LP#1873315>
> +
>  # Menu: General setup >> IRQ subsystem
>  CONFIG_IRQ_FORCED_THREADING_DEFAULT             policy<{'amd64-generic': 'n', 'amd64-lowlatency': 'y', 'arm64': 'n', 'armhf': 'n', 'i386-generic': 'n', 'i386-lowlatency': 'y', 'ppc64el': 'n'}>
>  CONFIG_SPARSE_IRQ                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index af9d355db654..065a0af8c2df 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -505,6 +505,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_PCF8523=m
>  CONFIG_RTC_DRV_PL031=m
>  CONFIG_RTC_DRV_TWL4030=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
> index ed4d48d79036..5b3e923157b3 100644
> --- a/debian.master/config/armhf/config.common.armhf
> +++ b/debian.master/config/armhf/config.common.armhf
> @@ -482,6 +482,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=m
>  CONFIG_RTC_DRV_PL031=y
>  CONFIG_RTC_DRV_TWL4030=y
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=y
>  # CONFIG_SCHED_SMT is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 10400ef5ec7b..f502f2bdfa07 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -8291,7 +8291,6 @@ CONFIG_RTW88_DEBUG=y
>  CONFIG_RTW88_DEBUGFS=y
>  CONFIG_RTW88_PCI=m
>  # CONFIG_RTW88_REGD_USER_REG_HINTS is not set
> -CONFIG_RT_GROUP_SCHED=y
>  CONFIG_RT_MUTEXES=y
>  CONFIG_RUNTIME_TESTING_MENU=y
>  CONFIG_RWSEM_SPIN_ON_OWNER=y
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 150b9e14147a..d5fb1d3dbd03 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -480,6 +480,7 @@ CONFIG_ROMFS_FS=m
>  CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=y
>  CONFIG_RTC_DRV_PCF8523=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index e3c13275ffc9..c590267e3eb8 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -486,6 +486,7 @@ CONFIG_RPMSG_VIRTIO=m
>  CONFIG_RTC_DRV_CMOS=m
>  CONFIG_RTC_DRV_PCF8523=m
>  CONFIG_RTC_DRV_TWL4030=m
> +CONFIG_RT_GROUP_SCHED=y
>  CONFIG_S2IO=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SCHED_SMT=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 6573f80165b1..9c8bb6be7ca1 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -444,6 +444,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
>  # CONFIG_RMI4_CORE is not set
>  # CONFIG_ROMFS_FS is not set
>  # CONFIG_RPMSG_VIRTIO is not set
> +CONFIG_RT_GROUP_SCHED=y
>  # CONFIG_S2IO is not set
>  CONFIG_SCHED_SMT=y
>  # CONFIG_SCSI_3W_9XXX is not set
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index d1662374ea94..cc5ca64ba034 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -8,3 +8,4 @@  CONFIG_HZ_250=y
 # CONFIG_LATENCYTOP is not set
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_RT_GROUP_SCHED=y
diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
index 814348dc984b..5f438aac9f49 100644
--- a/debian.master/config/amd64/config.flavour.lowlatency
+++ b/debian.master/config/amd64/config.flavour.lowlatency
@@ -8,3 +8,4 @@  CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
 CONFIG_LATENCYTOP=y
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_RT_GROUP_SCHED is not set
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b0921ccdbbac..dd6481141e9f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10390,9 +10390,12 @@  CONFIG_CGROUP_DEBUG                             policy<{'amd64': 'n', 'arm64': '
 CONFIG_CGROUP_SCHED                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FAIR_GROUP_SCHED                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_CFS_BANDWIDTH                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_RT_GROUP_SCHED                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_RT_GROUP_SCHED                           policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'n', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_UCLAMP_TASK_GROUP                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 
+CONFIG_RT_GROUP_SCHED                           note<LP#1284731>
+CONFIG_RT_GROUP_SCHED                           note<LP#1873315>
+
 # Menu: General setup >> IRQ subsystem
 CONFIG_IRQ_FORCED_THREADING_DEFAULT             policy<{'amd64-generic': 'n', 'amd64-lowlatency': 'y', 'arm64': 'n', 'armhf': 'n', 'i386-generic': 'n', 'i386-lowlatency': 'y', 'ppc64el': 'n'}>
 CONFIG_SPARSE_IRQ                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index af9d355db654..065a0af8c2df 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -505,6 +505,7 @@  CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_S2IO=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ed4d48d79036..5b3e923157b3 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -482,6 +482,7 @@  CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_S2IO=m
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SCHED_SMT is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 10400ef5ec7b..f502f2bdfa07 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8291,7 +8291,6 @@  CONFIG_RTW88_DEBUG=y
 CONFIG_RTW88_DEBUGFS=y
 CONFIG_RTW88_PCI=m
 # CONFIG_RTW88_REGD_USER_REG_HINTS is not set
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_RT_MUTEXES=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 150b9e14147a..d5fb1d3dbd03 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -480,6 +480,7 @@  CONFIG_ROMFS_FS=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_S2IO=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index e3c13275ffc9..c590267e3eb8 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -486,6 +486,7 @@  CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_S2IO=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SCHED_SMT=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6573f80165b1..9c8bb6be7ca1 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -444,6 +444,7 @@  CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RMI4_CORE is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_RPMSG_VIRTIO is not set
+CONFIG_RT_GROUP_SCHED=y
 # CONFIG_S2IO is not set
 CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_3W_9XXX is not set