Skip to content

Commit eb1319a

Browse files
committed
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
2 parents 410520d + 405fa8a commit eb1319a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/futex.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3744,12 +3744,12 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
37443744
switch (cmd) {
37453745
case FUTEX_WAIT:
37463746
val3 = FUTEX_BITSET_MATCH_ANY;
3747-
/* fall through */
3747+
fallthrough;
37483748
case FUTEX_WAIT_BITSET:
37493749
return futex_wait(uaddr, flags, val, timeout, val3);
37503750
case FUTEX_WAKE:
37513751
val3 = FUTEX_BITSET_MATCH_ANY;
3752-
/* fall through */
3752+
fallthrough;
37533753
case FUTEX_WAKE_BITSET:
37543754
return futex_wake(uaddr, flags, val, val3);
37553755
case FUTEX_REQUEUE:

0 commit comments

Comments
 (0)