diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:46:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:46:55 +0200 |
| commit | af1a34f21150af199f066dfcccbae9830c9429aa (patch) | |
| tree | 313267459418f7bba8510df45ce18d4b4133eb1b /arch/arc/configs/vdk_hs38_smp_defconfig | |
| parent | 39208aa7ecb7d9c4e86df782b5693270313cbab1 (diff) | |
| parent | c7e2f69d3ed2e56de1f5eaaf37c0f5f91d7adb0a (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/configs/vdk_hs38_smp_defconfig')
| -rw-r--r-- | arch/arc/configs/vdk_hs38_smp_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig index 5c0971787acf..7b71464f6c2f 100644 --- a/arch/arc/configs/vdk_hs38_smp_defconfig +++ b/arch/arc/configs/vdk_hs38_smp_defconfig @@ -98,7 +98,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_SHIRQ=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 |