The following commit has been merged into the ras/core branch of tip: Commit-ID: 633cdaf29ec4aae29868320adb3a4f1c5b8c0eac Gitweb: https://git.kernel.org/tip/633cdaf29ec4aae29868320adb3a4f1c5b8c0eac Author: Tom Rix <trix@xxxxxxxxxx> AuthorDate: Mon, 19 Oct 2020 13:08:03 -07:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 26 Oct 2020 12:24:35 +01:00 x86/mce: Remove unneeded break A break is not needed if it is preceded by a return. Signed-off-by: Tom Rix <trix@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20201019200803.17619-1-trix@xxxxxxxxxx --- arch/x86/kernel/cpu/mce/core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 4102b86..51bf910 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1811,11 +1811,9 @@ static int __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c) case X86_VENDOR_INTEL: intel_p5_mcheck_init(c); return 1; - break; case X86_VENDOR_CENTAUR: winchip_mcheck_init(c); return 1; - break; default: return 0; }
|