evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: perf_counter cleanup

Browse source 
Use and actual unsigned long bitmap instead of casting our way around.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Jaswinder Singh Rajput <jaswinder@kernel.org>
LKML-Reference: <1236508459.22914.3645.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-03-08 11:34:19 +01:00 • committed by Ingo Molnar
parent 880860e392
commit 184fe4ab1f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kernel/cpu/perf_counter.c
View file

@ -37,7 +37,7 @@ struct cpu_hw_counters {
unsigned long used[BITS_TO_LONGS(X86_PMC_IDX_MAX)]; unsigned long used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
unsigned long interrupts; unsigned long interrupts;
u64 throttle_ctrl; u64 throttle_ctrl;
u64 active_mask; unsigned long active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
int enabled; int enabled;
}; };
@ -291,7 +291,7 @@ static void pmc_amd_restore_all(u64 ctrl)
return; return;
for (idx = 0; idx < nr_counters_generic; idx++) { for (idx = 0; idx < nr_counters_generic; idx++) {
if (test_bit(idx, (unsigned long *)&cpuc->active_mask)) { if (test_bit(idx, cpuc->active_mask)) {
u64 val; u64 val;
rdmsrl(MSR_K7_EVNTSEL0 + idx, val); rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
@ -377,7 +377,7 @@ static void pmc_amd_enable(int idx, u64 config)
{ {
struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters); struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
set_bit(idx, (unsigned long *)&cpuc->active_mask); set_bit(idx, cpuc->active_mask);
if (cpuc->enabled) if (cpuc->enabled)
config |= ARCH_PERFMON_EVENTSEL0_ENABLE; config |= ARCH_PERFMON_EVENTSEL0_ENABLE;
@ -401,7 +401,7 @@ static void pmc_amd_disable(int idx, u64 config)
{ {
struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters); struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
clear_bit(idx, (unsigned long *)&cpuc->active_mask); clear_bit(idx, cpuc->active_mask);
wrmsrl(MSR_K7_EVNTSEL0 + idx, config); wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
} }