diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-10-15 17:58:58 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-10-15 17:58:58 +0300 |
| commit | 6e20c253608b0ba2876c1aabe95f885d7000e9b4 (patch) | |
| tree | 3f6b20b14c4a3f8351ccccf03cd5106f46415f61 /kernel/watchdog.c | |
| parent | 442f10325b03f41029170b8150eb8714a96b4291 (diff) | |
| parent | 20ef35f70a8e49809b248df3f8e05fdd53753534 (diff) | |
Merge remote-tracking branch 'drm_intel_push/topic/core-for-CI' into drm-tip
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 262691ba62b7..acc0b648aaa0 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -214,6 +214,8 @@ void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs) if (hardlockup_panic) nmi_panic(regs, "Hard LOCKUP"); + else + add_taint(TAINT_WARN, LOCKDEP_STILL_OK); per_cpu(watchdog_hardlockup_warned, cpu) = true; } else { @@ -770,6 +772,8 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) add_taint(TAINT_SOFTLOCKUP, LOCKDEP_STILL_OK); if (softlockup_panic) panic("softlockup: hung tasks"); + else + add_taint(TAINT_WARN, LOCKDEP_STILL_OK); } return HRTIMER_RESTART; |