CHROMIUM: config: CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
It's already set for non-x86 architectures; x86 is the oddball, instead
relying on specifying `nmi_watchdog=panic` in build_kernel_image.sh.
It's generally best to avoid relying on kernel command-line for this
kind of configuration though, so specify it here instead.
Generated by
echo CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y >> \
chromeos/config/x86_64/common.config
chromeos/scripts/kernelconfig olddefconfig
atop a normalized config.
BUG=b:172222678
TEST=none
Signed-off-by: Brian Norris <briannorris@chromium.org>
Change-Id: Idd46b11e21ade10bf7f399055a7d462076137335
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2530136
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 37e876ba..d6bebab 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -90,8 +90,6 @@
CONFIG_ATAGS=y
# CONFIG_ATMEL_PWM is not set
# CONFIG_AX88796 is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
CONFIG_BRCMDBG=y
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index bffc46c..7996630 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -161,6 +161,8 @@
# CONFIG_BMP085_I2C is not set
# CONFIG_BMP085_SPI is not set
# CONFIG_BONDING is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index b54dcb0..db3352e 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -138,8 +138,6 @@
CONFIG_BLOCK_COMPAT=y
# CONFIG_BNX2 is not set
# CONFIG_BNX2X is not set
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_BPCTL is not set
CONFIG_BT_ATH3K=m
