diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 00:24:16 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-16 00:24:16 -0800 | 
| commit | 5e60366d56c630e32befce7ef05c569e04391ca3 (patch) | |
| tree | 29e1f2ae1191d6b1741dd2bec179514c2dcab632 /arch/powerpc | |
| parent | 706451d47b3716c24e0553dfdefba11d202effc1 (diff) | |
| parent | 36f9ff9e03de89691274a6aec45aa079bd3ae405 (diff) | |
| download | linux-5e60366d56c630e32befce7ef05c569e04391ca3.tar.bz2 | |
Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux
Pull fallthrough fixes from Gustavo A. R. Silva:
 "Fix many fall-through warnings when building with Clang 12.0.0
  using -Wimplicit-fallthrough.
   - powerpc: boot: include compiler_attributes.h (Nick Desaulniers)
   - Revert "lib: Revert use of fallthrough pseudo-keyword in lib/"
     (Nick Desaulniers)
   - powerpc: fix -Wimplicit-fallthrough (Nick Desaulniers)
   - lib: Fix fall-through warnings for Clang (Gustavo A. R. Silva)"
* tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  lib: Fix fall-through warnings for Clang
  powerpc: fix -Wimplicit-fallthrough
  Revert "lib: Revert use of fallthrough pseudo-keyword in lib/"
  powerpc: boot: include compiler_attributes.h
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/boot/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/boot/decompress.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/uprobes.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/perf/imc-pmu.c | 1 | 
5 files changed, 4 insertions, 1 deletions
| diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index f8ce6d2dde7b..1659963a8f1d 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -31,6 +31,7 @@ endif  BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \  		 -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \  		 -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ +		 -include $(srctree)/include/linux/compiler_attributes.h \  		 $(LINUXINCLUDE)  ifdef CONFIG_PPC64_BOOT_WRAPPER diff --git a/arch/powerpc/boot/decompress.c b/arch/powerpc/boot/decompress.c index 8bf39ef7d2df..6098b879ac97 100644 --- a/arch/powerpc/boot/decompress.c +++ b/arch/powerpc/boot/decompress.c @@ -21,7 +21,6 @@  #define STATIC static  #define INIT -#define __always_inline inline  /*   * The build process will copy the required zlib source files and headers diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 38ae5933d917..e9d4eb6144e1 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -355,6 +355,7 @@ static int __init prom_strtobool(const char *s, bool *res)  		default:  			break;  		} +		break;  	default:  		break;  	} diff --git a/arch/powerpc/kernel/uprobes.c b/arch/powerpc/kernel/uprobes.c index d200e7df7167..e8a63713e655 100644 --- a/arch/powerpc/kernel/uprobes.c +++ b/arch/powerpc/kernel/uprobes.c @@ -141,6 +141,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self,  	case DIE_SSTEP:  		if (uprobe_post_sstep_notifier(regs))  			return NOTIFY_STOP; +		break;  	default:  		break;  	} diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 7b25548ec42b..e106909ff9c3 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -1500,6 +1500,7 @@ static int update_pmu_ops(struct imc_pmu *pmu)  		pmu->pmu.stop = trace_imc_event_stop;  		pmu->pmu.read = trace_imc_event_read;  		pmu->attr_groups[IMC_FORMAT_ATTR] = &trace_imc_format_group; +		break;  	default:  		break;  	} |