[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-2b0fc3742bc77687f58d389c902ee092df6f8669@git.kernel.org>
Date: Tue, 29 Jan 2019 07:27:57 -0800
From: "tip-bot for Gustavo A. R. Silva" <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, tglx@...utronix.de, mingo@...hat.com,
peterz@...radead.org, keescook@...omium.org, hpa@...or.com,
x86@...nel.org, gustavo@...eddedor.com, qianyue.zj@...baba-inc.com,
jacek.tomaka@...zta.fm, jolsa@...nel.org, ak@...ux.intel.com,
mingo@...nel.org, bp@...e.de, kan.liang@...ux.intel.com
Subject: [tip:x86/cleanups] x86/events: Mark expected switch-case
fall-throughs
Commit-ID: 2b0fc3742bc77687f58d389c902ee092df6f8669
Gitweb: https://git.kernel.org/tip/2b0fc3742bc77687f58d389c902ee092df6f8669
Author: Gustavo A. R. Silva <gustavo@...eddedor.com>
AuthorDate: Fri, 25 Jan 2019 12:49:17 -0600
Committer: Borislav Petkov <bp@...e.de>
CommitDate: Tue, 29 Jan 2019 16:23:47 +0100
x86/events: Mark expected switch-case fall-throughs
In preparation to enable -Wimplicit-fallthrough by default, mark
switch-case statements where fall-through is intentional, explicitly in
order to fix a couple of -Wimplicit-fallthrough warnings.
Warning level 3 was used: -Wimplicit-fallthrough=3.
[ bp: Massasge and trim commit message. ]
Signed-off-by: Gustavo A. R. Silva <gustavo@...eddedor.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Acked-by: Peter Zijlstra <peterz@...radead.org>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Jacek Tomaka <jacek.tomaka@...zta.fm>
Cc: Jia Zhang <qianyue.zj@...baba-inc.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Kan Liang <kan.liang@...ux.intel.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: x86-ml <x86@...nel.org>
Link: https://lkml.kernel.org/r/20190125184917.GA7289@embeddedor
---
arch/x86/events/intel/core.c | 2 ++
arch/x86/events/intel/lbr.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 40e12cfc87f6..ece43e7e4569 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4168,6 +4168,8 @@ __init int intel_pmu_init(void)
case INTEL_FAM6_CORE2_MEROM:
x86_add_quirk(intel_clovertown_quirk);
+ /* fall through */
+
case INTEL_FAM6_CORE2_MEROM_L:
case INTEL_FAM6_CORE2_PENRYN:
case INTEL_FAM6_CORE2_DUNNINGTON:
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index c88ed39582a1..580c1b91c454 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -931,6 +931,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort)
ret = X86_BR_ZERO_CALL;
break;
}
+ /* fall through */
case 0x9a: /* call far absolute */
ret = X86_BR_CALL;
break;
Powered by blists - more mailing lists