linux-next: build failure after merge of the kspp-gustavo tree

[Stephen Rothwell]

Hi all,

After merging the kspp-gustavo tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/compiler_types.h:65,
                 from <command-line>:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':
include/linux/compiler_attributes.h:214:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror]
  214 | # define fallthrough                    __attribute__((__fallthrough__))
      |                                         ^~~~~~~~~~~~~
arch/powerpc/net/bpf_jit_comp64.c:847:4: note: in expansion of macro 'fallthrough'
  847 |    fallthrough;
      |    ^~~~~~~~~~~

Caused by commit

  02b894b985cb ("treewide: Use fallthrough pseudo-keyword")

I have added the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 18 Aug 2020 09:26:47 +1000
Subject: [PATCH] revert part of "treewide: Use fallthrough pseudo-keyword"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/powerpc/net/bpf_jit_comp64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
index 57412af338fb..022103c6a201 100644
--- a/arch/powerpc/net/bpf_jit_comp64.c
+++ b/arch/powerpc/net/bpf_jit_comp64.c
@@ -844,7 +844,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
 		case BPF_JMP32 | BPF_JSET | BPF_K:
 		case BPF_JMP32 | BPF_JSET | BPF_X:
 			true_cond = COND_NE;
-			fallthrough;
+			/* Fall through */
 
 cond_branch:
 			switch (code) {
-- 
2.28.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgp6F8T9vRAL0.pgp
Description: OpenPGP digital signature