UBUNTU: [Config] CONFIG_RCU_SCALE_TEST=n

BugLink: https://bugs.launchpad.net/bugs/1904906
This was enabled when rebasing to 5.10-rc1, but it is not an
option we would normally enable, and no justification was
provided for enabling it. The option also may be related to
ppc64el boot problems (though it is as of yet unclear how that
would be possible), so let's disable it.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/abi/5.10.0-5.6/modules.ignore b/debian.master/abi/5.10.0-5.6/modules.ignore
new file mode 100644 (file)
index 0000000..bebd24f
--- /dev/null
+++ b/debian.master/abi/5.10.0-5.6/modules.ignore
@@ -0,0 +1,2 @@
+rcuscale
+torture

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f7f4da8cda89aed1f6297f2db3a41f0eedd1ff17..8cf8ec494911e1c77cdfada3e12d58a2d5845bea 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11386,7 +11386,7 @@ CONFIG_KASAN                                    policy<{'amd64': 'n', 'arm64': '
 CONFIG_DEBUG_KMEMLEAK                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 
 # Menu: Kernel hacking >> RCU Debugging
-CONFIG_RCU_SCALE_TEST                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_RCU_SCALE_TEST                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_RCU_TORTURE_TEST                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_RCU_REF_SCALE_TEST                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_RCU_CPU_STALL_TIMEOUT                    policy<{'amd64': '60', 'arm64': '60', 'armhf': '60', 'ppc64el': '21', 's390x': '21'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 91314462f5a18fe74a0158d27b45f657854927bc..aa82bbaa4f7e33c19933052c364be0e3319fa694 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8191,7 +8191,7 @@ CONFIG_RCAR_THERMAL=m
 # CONFIG_RCU_EXPERT is not set
 CONFIG_RCU_NEED_SEGCBLIST=y
 # CONFIG_RCU_REF_SCALE_TEST is not set
-CONFIG_RCU_SCALE_TEST=m
+# CONFIG_RCU_SCALE_TEST is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
@@ -10672,7 +10672,6 @@ CONFIG_TN3270_CONSOLE=y
 CONFIG_TN3270_FS=m
 CONFIG_TN3270_TTY=y
 CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TORTURE_TEST=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 # CONFIG_TOSHIBA_WMI is not set