arch/x86/events - make more stuff static
Subsystems (2)
PATCH 1/1 arch/x86/events - make more stuff static
When building with C=2, sparse makes note of a number of things:
CHECK arch/x86/events/intel/rapl.carch/x86/events/intel/rapl.c:637:30: warning: symbol 'rapl_attr_update' was not declared. Should it be static?
CHECK arch/x86/events/intel/cstate.carch/x86/events/intel/cstate.c:449:30: warning: symbol 'core_attr_update' was not declared. Should it be static? arch/x86/events/intel/cstate.c:457:30: warning: symbol 'pkg_attr_update' was not declared. Should it be static?
CHECK arch/x86/events/msr.carch/x86/events/msr.c:170:30: warning: symbol 'attr_update' was not declared. Should it be static?
And they can indeed be static.
arch/x86/events/intel/cstate.c +2 -2
@@ -446,7 +446,7 @@ static int cstate_cpu_init(unsigned int cpu)return 0 ; } -const struct attribute_group *core_attr_update[] = { +static const struct attribute_group *core_attr_update[] = { &group_cstate_core_c1, &group_cstate_core_c3, &group_cstate_core_c6,
@@ -454,7 +454,7 @@ const struct attribute_group *core_attr_update[] = { NULL, }; -const struct attribute_group *pkg_attr_update[] = { +static const struct attribute_group *pkg_attr_update[] = { &group_cstate_pkg_c2, &group_cstate_pkg_c3, &group_cstate_pkg_c6,
arch/x86/events/intel/rapl.c +1 -1
@@ -634,7 +634,7 @@ static void cleanup_rapl_pmus(void)kfree (rapl_pmus); } -const struct attribute_group *rapl_attr_update[] = { +static const struct attribute_group *rapl_attr_update[] = { &rapl_events_cores_group, &rapl_events_pkg_group, &rapl_events_ram_group,
arch/x86/events/msr.c +1 -1
@@ -167,7 +167,7 @@ static const struct attribute_group *attr_groups[] = { NULL, }; -const struct attribute_group *attr_update[] = { +static const struct attribute_group *attr_update[] = { &group_aperf, &group_mperf, &group_pperf,
[tip: perf/core] perf/x86: Make more stuff static
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: d9f3b450f206332b7ef3d78b5a85b6c20ad00fd2 Gitweb: https://git.kernel.org/tip/d9f3b450f206332b7ef3d78b5a85b6c20ad00fd2 Author: Valdis Klētnieks <[email protected]> AuthorDate: Thu, 08 Aug 2019 13:44:02 -04:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 03 Sep 2019 09:22:32 +02:00
perf/x86: Make more stuff static
When building with C=2, sparse makes note of a number of things:
arch/x86/events/intel/rapl.c:637:30: warning: symbol 'rapl_attr_update' was not declared. Should it be static? arch/x86/events/intel/cstate.c:449:30: warning: symbol 'core_attr_update' was not declared. Should it be static? arch/x86/events/intel/cstate.c:457:30: warning: symbol 'pkg_attr_update' was not declared. Should it be static? arch/x86/events/msr.c:170:30: warning: symbol 'attr_update' was not declared. Should it be static? arch/x86/events/intel/lbr.c:276:1: warning: symbol 'lbr_from_quirk_key' was not declared. Should it be static?
And they can all indeed be static.
--- arch/x86/events/intel/cstate.c | 4 ++-- arch/x86/events/intel/lbr.c | 2 +- arch/x86/events/intel/rapl.c | 2 +- arch/x86/events/msr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/events/intel/cstate.c +2 -2
@@ -446,7 +446,7 @@ static int cstate_cpu_init(unsigned int cpu)return 0 ; } -const struct attribute_group *core_attr_update[] = { +static const struct attribute_group *core_attr_update[] = { &group_cstate_core_c1, &group_cstate_core_c3, &group_cstate_core_c6,
@@ -454,7 +454,7 @@ const struct attribute_group *core_attr_update[] = { NULL, }; -const struct attribute_group *pkg_attr_update[] = { +static const struct attribute_group *pkg_attr_update[] = { &group_cstate_pkg_c2, &group_cstate_pkg_c3, &group_cstate_pkg_c6,
arch/x86/events/intel/lbr.c +1 -1
@@ -273,7 +273,7 @@ static inline bool lbr_from_signext_quirk_needed(void)return !tsx_support && (lbr_desc[lbr_format] &LBR_TSX ); } -DEFINE_STATIC_KEY_FALSE (lbr_from_quirk_key); +static DEFINE_STATIC_KEY_FALSE (lbr_from_quirk_key);/* If quirk is enabled, ensure sign extension is 63 bits: */ inline u64 lbr_from_signext_quirk_wr (u64 val)
arch/x86/events/intel/rapl.c +1 -1
@@ -634,7 +634,7 @@ static void cleanup_rapl_pmus(void)kfree (rapl_pmus); } -const struct attribute_group *rapl_attr_update[] = { +static const struct attribute_group *rapl_attr_update[] = { &rapl_events_cores_group, &rapl_events_pkg_group, &rapl_events_ram_group,
arch/x86/events/msr.c +1 -1
@@ -167,7 +167,7 @@ static const struct attribute_group *attr_groups[] = { NULL, }; -const struct attribute_group *attr_update[] = { +static const struct attribute_group *attr_update[] = { &group_aperf, &group_mperf, &group_pperf,