diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-26 18:47:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-26 18:47:00 +0200 |
| commit | a9ce323378927d6e181d8527b718f792b8dcb6f2 (patch) | |
| tree | e5d26d4ed906b8310301d7813e043a57f578c546 /kernel | |
| parent | Merge tag 'libnvdimm-for-4.19_dax-memory-failure' of gitolite.kernel.org:pub/... (diff) | |
| parent | futex: Mark expected switch fall-throughs (diff) | |
| download | linux-a9ce323378927d6e181d8527b718f792b8dcb6f2.tar.xz linux-a9ce323378927d6e181d8527b718f792b8dcb6f2.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 2 |
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: |