Merge remote-tracking branch 'y2038/y2038'

[linux] / kernel / time / hrtimer.c

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 0f5f960..41dfff2 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -364,7 +364,7 @@ static bool hrtimer_fixup_activate(void *addr, enum debug_obj_state state)
        switch (state) {
        case ODEBUG_STATE_ACTIVE:
                WARN_ON(1);
-
+               /* fall through */
        default:
                return false;
        }