x86: perf_counter remove unwanted hw_perf_enable_all
PATCH 1/1 x86: perf_counter remove unwanted hw_perf_enable_all
Impact: clean, reduce kernel size a bit, avoid sparse warnings
Fixes sparse warnings:
arch/x86/kernel/cpu/perf_counter.c:153:6: warning: symbol 'hw_perf_enable_all' was not declared. Should it be static? arch/x86/kernel/cpu/perf_counter.c:279:3: warning: returning void-valued expression arch/x86/kernel/cpu/perf_counter.c:206:3: warning: returning void-valued expression arch/x86/kernel/cpu/perf_counter.c:206:3: warning: returning void-valued expression
--- arch/x86/kernel/cpu/perf_counter.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +7 -17
@@ -150,14 +150,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter)return 0 ; } -void hw_perf_enable_all (void ) -{ -if (unlikely (!perf_counters_initialized)) -return ; - -wrmsrl (MSR_CORE_PERF_GLOBAL_CTRL , perf_counter_mask); -} -u64 hw_perf_save_disable (void ) {u64 ctrl;
@@ -200,12 +192,10 @@ static inline void __pmc_generic_disable(struct perf_counter *counter, struct hw_perf_counter *hwc, unsigned int idx) { - int err; - if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) -return __pmc_fixed_disable (counter, hwc, idx); - - err =wrmsr_safe (hwc->config_base + idx, hwc->config,0 ); + __pmc_fixed_disable(counter, hwc, idx); + else + wrmsr_safe(hwc->config_base + idx, hwc->config, 0); } static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
@@ -276,10 +266,10 @@ __pmc_generic_enable(struct perf_counter *counter, struct hw_perf_counter *hwc, int idx) {if (unlikely (hwc->config_base ==MSR_ARCH_PERFMON_FIXED_CTR_CTRL )) -return __pmc_fixed_enable (counter, hwc, idx); - -wrmsr (hwc->config_base + idx, - hwc->config |ARCH_PERFMON_EVENTSEL0_ENABLE ,0 ); +__pmc_fixed_enable (counter, hwc, idx); +else +wrmsr (hwc->config_base + idx, + hwc->config |ARCH_PERFMON_EVENTSEL0_ENABLE ,0 ); } static int
Signature · 1 line
1.5.5.1
Ingo Molnar
AppliedQuoted 9 lines · Jaswinder Singh Rajput
Impact: clean, reduce kernel size a bit, avoid sparse warnings
Fixes sparse warnings:
arch/x86/kernel/cpu/perf_counter.c:153:6: warning: symbol 'hw_perf_enable_all' was not declared. Should it be static?arch/x86/kernel/cpu/perf_counter.c:279:3: warning: returning void-valued expressionarch/x86/kernel/cpu/perf_counter.c:206:3: warning: returning void-valued expressionarch/x86/kernel/cpu/perf_counter.c:206:3: warning: returning void-valued expression
Quoted 4 lines
Signed-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/kernel/cpu/perf_counter.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-)
applied to tip/perfcounters/core, thanks!
Ingo