The following commit has been merged into the locking/urgent branch of tip: Commit-ID: 405fa8ac89e7aaa87282df659e525992f2639e76 Gitweb: https://git.kernel.org/tip/405fa8ac89e7aaa87282df659e525992f2639e76 Author: Miaohe Lin <linmiaohe@xxxxxxxxxx> AuthorDate: Thu, 13 Aug 2020 08:21:17 -04:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Thu, 13 Aug 2020 21:02:12 +02:00 futex: Convert to use the preferred 'fallthrough' macro Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200813122117.51173-1-linmiaohe@xxxxxxxxxx --- kernel/futex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 61e8153..a587669 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:
![]() |