diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-10-09 08:55:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-10-09 08:55:17 +0200 |
| commit | e705d397965811ac528d7213b42d74ffe43caf38 (patch) | |
| tree | 8a5bbe85cc42e64992b97859976e307027f83e33 /kernel/time/timer.c | |
| parent | d89d5f855f84ccf3f7e648813b4bb95c780bd7cd (diff) | |
| parent | baffd723e44dc3d7f84f0b8f1fe1ece00ddd2710 (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index a16764b0116e..a50364df1054 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -666,7 +666,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state) case ODEBUG_STATE_ACTIVE: WARN_ON(1); - /* fall through */ + fallthrough; default: return false; } |