Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull licking update from Thomas Gleixner:
 "Mark the switch cases which fall through to the next case with the
  proper comment so the fallthrough compiler checks can be enabled"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Mark expected switch fall-throughs

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 1f450e092c74..11fc3bb456d6 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3523,10 +3523,12 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
         switch (cmd) {
         case FUTEX_WAIT:
                 val3 = FUTEX_BITSET_MATCH_ANY;
+                /* fall through */
         case FUTEX_WAIT_BITSET:
                 return futex_wait(uaddr, flags, val, timeout, val3);
         case FUTEX_WAKE:
                 val3 = FUTEX_BITSET_MATCH_ANY;
+                /* fall through */
         case FUTEX_WAKE_BITSET:
                 return futex_wake(uaddr, flags, val, val3);
         case FUTEX_REQUEUE: