Skip to contentSkip to conversation

futex: Mark expected switch fall-throughs

PATCH New Gustavo A. R. Silva 2 participants 2 messages Aug 16, 2018 – Aug 20, 2018

lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 futex: Mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 kernel/futex.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/futex.c +2 -0
index 1f450e0..11fc3bb 100644
@@ -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:
Signature · 1 line
2.7.4
merge bot
#1 lore raw
futex: Mark expected switch fall-throughs
Commit-ID:  b639186ffe9168fd1d2f95a1fff8571720739126
Gitweb:     https://git.kernel.org/tip/b639186ffe9168fd1d2f95a1fff8571720739126
Author:     Gustavo A. R. Silva <[email protected]>
AuthorDate: Thu, 16 Aug 2018 12:21:24 -0500
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 20 Aug 2018 18:23:00 +0200

futex: Mark expected switch fall-throughs

In preparation of enabling -Wimplicit-fallthrough, mark switch cases which fall through.

Signed-off-by Gustavo A. R. Silva <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Darren Hart <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 kernel/futex.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/futex.c +2 -0
index 1f450e092c74..11fc3bb456d6 100644
@@ -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: