Commit 5e60366d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fallthrough-fixes-clang-5.11-rc1' of... 

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
parents 706451d4 36f9ff9e

arch/powerpc/boot/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/boot/decompress.c

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/prom_init.c

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ static int __init prom_strtobool(const char *s, bool *res) 
		default:

			break;

		}

		break;

	default:

		break;

	}

arch/powerpc/kernel/uprobes.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}

arch/powerpc/perf/imc-pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE