git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf, x86: Clean up IA32_PERF_CAPABILITIES usage
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
cpu
/
perf_event_p6.c
diff --git
a/arch/x86/kernel/cpu/perf_event_p6.c
b/arch/x86/kernel/cpu/perf_event_p6.c
index
a4e67b9
..
a330485
100644
(file)
--- a/
arch/x86/kernel/cpu/perf_event_p6.c
+++ b/
arch/x86/kernel/cpu/perf_event_p6.c
@@
-77,27
+77,29
@@
static void p6_pmu_enable_all(void)
}
static inline void
}
static inline void
-p6_pmu_disable_event(struct
hw_perf_event *hwc, int idx
)
+p6_pmu_disable_event(struct
perf_event *event
)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+ struct hw_perf_event *hwc = &event->hw;
u64 val = P6_NOP_EVENT;
if (cpuc->enabled)
val |= ARCH_PERFMON_EVENTSEL_ENABLE;
u64 val = P6_NOP_EVENT;
if (cpuc->enabled)
val |= ARCH_PERFMON_EVENTSEL_ENABLE;
- (void)checking_wrmsrl(hwc->config_base + idx, val);
+ (void)checking_wrmsrl(hwc->config_base +
hwc->
idx, val);
}
}
-static void p6_pmu_enable_event(struct
hw_perf_event *hwc, int idx
)
+static void p6_pmu_enable_event(struct
perf_event *event
)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+ struct hw_perf_event *hwc = &event->hw;
u64 val;
val = hwc->config;
if (cpuc->enabled)
val |= ARCH_PERFMON_EVENTSEL_ENABLE;
u64 val;
val = hwc->config;
if (cpuc->enabled)
val |= ARCH_PERFMON_EVENTSEL_ENABLE;
- (void)checking_wrmsrl(hwc->config_base + idx, val);
+ (void)checking_wrmsrl(hwc->config_base +
hwc->
idx, val);
}
static __initconst struct x86_pmu p6_pmu = {
}
static __initconst struct x86_pmu p6_pmu = {