Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9583833e authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Vineet Gupta
Browse files

ARC: [*defconfig] Reenable soft lock-up detector 



Commit 92e5aae4 "kernel/watchdog: split up config options"
introduced SOFTLOCKUP_DETECTOR which selects LOCKUP_DETECTOR
instead of the latter to be selected itself.

We need to adjust our defconfigs accordingly.

Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 976e78a5

arch/arc/configs/axs101_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_STRIP_ASM_SYMS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

arch/arc/configs/axs103_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_STRIP_ASM_SYMS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

arch/arc/configs/axs103_smp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_STRIP_ASM_SYMS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

arch/arc/configs/haps_hs_smp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -84,5 +84,5 @@ CONFIG_TMPFS=y 
CONFIG_NFS_FS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

# CONFIG_DEBUG_PREEMPT is not set

arch/arc/configs/hsdk_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_STRIP_ASM_SYMS=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set