diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-15 10:32:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-15 10:32:18 -0700 |
| commit | eb1319af4119c4936e02c879295e9fd4d50bbe3a (patch) | |
| tree | 74259c18c408f918fdb32e92ebf37682869e7ea4 /kernel | |
| parent | Merge tag '9p-for-5.9-rc1' of git://github.com/martinetd/linux (diff) | |
| parent | futex: Convert to use the preferred 'fallthrough' macro (diff) | |
| download | wireguard-linux-eb1319af4119c4936e02c879295e9fd4d50bbe3a.tar.xz wireguard-linux-eb1319af4119c4936e02c879295e9fd4d50bbe3a.zip | |
Merge tag 'locking-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixlets from Ingo Molnar:
"A documentation fix and a 'fallthrough' macro update"
* tag 'locking-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Convert to use the preferred 'fallthrough' macro
Documentation/locking/locktypes: Fix a typo
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 61e8153e6c76..a5876694a60e 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3744,12 +3744,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 */ + fallthrough; case FUTEX_WAIT_BITSET: return futex_wait(uaddr, flags, val, timeout, val3); case FUTEX_WAKE: val3 = FUTEX_BITSET_MATCH_ANY; - /* fall through */ + fallthrough; case FUTEX_WAKE_BITSET: return futex_wake(uaddr, flags, val, val3); case FUTEX_REQUEUE: |