kernel: Set CONFIG_RCU_CPU_STALL_TIMEOUT=21

The default value for CONFIG_RCU_CPU_STALL_TIMEOUT was changed from 60
seconds to 21 seconds in 2012 in the upstream kernel. Some targets
already use 21 seconds.

This patch changes the default value in the generic configuration to 21
seconds and removes the target specific configuration options.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Rui Salvaterra <rsalvaterra@gmail.com>

diff --git a/target/linux/gemini/config-5.10 b/target/linux/gemini/config-5.10
index 319fb6abfd68d0a714846287264371c227ac9217..7fdcc075e621db3b3fcec0e28a8274358488e55e 100644 (file)
--- a/target/linux/gemini/config-5.10
+++ b/target/linux/gemini/config-5.10
@@ -332,7 +332,6 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y

diff --git a/target/linux/gemini/config-5.4 b/target/linux/gemini/config-5.4
index 8a4f8fb04cf2874df5c94d44b8f5d0110fb5bdfc..fcb482aed7bb68543fd868d87b81035b581cb23b 100644 (file)
--- a/target/linux/gemini/config-5.4
+++ b/target/linux/gemini/config-5.4
@@ -368,7 +368,6 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 2aef5728c2b5876fe9774c67353b86e73eff29a3..a9160ee9b1315845457035f6d92b54f862f37305 100644 (file)
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -4628,7 +4628,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 7819d35fc988b151975306d3c0fc7ee12e5edd7c..a568a9ea7f4e4d5af88be74e6dc7da53ff076a3f 100644 (file)
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -4259,7 +4259,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set

diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 0bcabd0582b2ded6c18dc466631675d6d1d28aa6..79c6d6c6c267721002b681f91615913d60f141a4 100644 (file)
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -378,7 +378,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QRTR is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y

diff --git a/target/linux/ipq806x/config-5.10 b/target/linux/ipq806x/config-5.10
index b4460af17a196a400981100432ac60f62124e533..77d1bbda42526913513d0a504c90211dec20dd04 100644 (file)
--- a/target/linux/ipq806x/config-5.10
+++ b/target/linux/ipq806x/config-5.10
@@ -404,7 +404,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y

diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index 4aecf7dd43f3fbeaf516911ae0e43d3be9f9ef7e..191806585da9b079e2e7c1cd37bd1cbc979e0a95 100644 (file)
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -370,7 +370,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QRTR is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y

diff --git a/target/linux/ipq807x/config-default b/target/linux/ipq807x/config-default
index 383d57c4a1aa23e23563944aae86baf27012c362..ad4aca1b48b9690840135f8a6a471aa476d96314 100644 (file)
--- a/target/linux/ipq807x/config-default
+++ b/target/linux/ipq807x/config-default
@@ -530,7 +530,6 @@ CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_GZIP=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y

diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4
index 2db242e858054769389df9a4e2395baa024bf14a..ed2e318cd632b91209b9072ee7f3758547fadc03 100644 (file)
--- a/target/linux/layerscape/armv7/config-5.4
+++ b/target/linux/layerscape/armv7/config-5.4
@@ -504,7 +504,6 @@ CONFIG_QORIQ_CPUFREQ=y
 # CONFIG_QUICC_ENGINE is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y

diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index 577174f6a54de6a1c39d4e21db9fb53b799921c0..9214bf9feadb882b1983c85d6d56617a9d828416 100644 (file)
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -670,7 +670,6 @@ CONFIG_QUOTACTL=y
 CONFIG_RAID6_PQ=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y

diff --git a/target/linux/mediatek/mt7623/config-5.10 b/target/linux/mediatek/mt7623/config-5.10
index 1adf04067cb99b5d96126c42e43a886c8fe21ea7..8c5c6c6e854e34cfc974140ae09984761d7e19cc 100644 (file)
--- a/target/linux/mediatek/mt7623/config-5.10
+++ b/target/linux/mediatek/mt7623/config-5.10
@@ -508,7 +508,6 @@ CONFIG_PWM_MEDIATEK=y
 CONFIG_PWM_SYSFS=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y

diff --git a/target/linux/oxnas/ox820/config-default b/target/linux/oxnas/ox820/config-default
index bb76a609688fc721f65e52dd15439690d324f06d..b81f76cc25cc5da3516d9dd6f2bf05ed47ac0042 100644 (file)
--- a/target/linux/oxnas/ox820/config-default
+++ b/target/linux/oxnas/ox820/config-default
@@ -78,7 +78,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PL310_ERRATA_753970 is not set
 # CONFIG_PL310_ERRATA_769419 is not set
 CONFIG_PM_SLEEP_SMP=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y

diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10
index c50474db4587611811d2869a66cac5c45a54793f..30dd24f5dbe4d4c09167f5406228e852ccfcd652 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.10
+++ b/target/linux/rockchip/armv8/config-5.10
@@ -482,7 +482,6 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_TRACE=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REGMAP=y

diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index 544f6f1c85e73a6e6a26fb119ea0b697a2f29658..3195bc53a523a9088f62db64f30462a6776f6346 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -462,7 +462,6 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_TRACE=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y

diff --git a/target/linux/tegra/config-5.10 b/target/linux/tegra/config-5.10
index 329ecb2d78b30d052dc0d7967a8c066c562ebed9..8b03db18097185073d3d8390f2fedc376700751a 100644 (file)
--- a/target/linux/tegra/config-5.10
+++ b/target/linux/tegra/config-5.10
@@ -349,7 +349,6 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y

diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 0ad606abefad790c80b435328b167b915e68922e..8bc3ab0bd7b07150a523c47817a650b444253950 100644 (file)
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -342,7 +342,6 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y