projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: perf: kill get_hw_events()
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
perf_event_v7.c
diff --git
a/arch/arm/kernel/perf_event_v7.c
b/arch/arm/kernel/perf_event_v7.c
index d62b27ce55e98a3cb0ad3ab59c5c592d9d9999f5..8993770c47de7ebdb59e5151bf2c4bc7948e19fd 100644
(file)
--- a/
arch/arm/kernel/perf_event_v7.c
+++ b/
arch/arm/kernel/perf_event_v7.c
@@
-701,7
+701,7
@@
static void armv7pmu_enable_event(struct perf_event *event)
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
int idx = hwc->idx;
if (!armv7_pmnc_counter_valid(cpu_pmu, idx)) {
int idx = hwc->idx;
if (!armv7_pmnc_counter_valid(cpu_pmu, idx)) {
@@
-747,7
+747,7
@@
static void armv7pmu_disable_event(struct perf_event *event)
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
int idx = hwc->idx;
if (!armv7_pmnc_counter_valid(cpu_pmu, idx)) {
int idx = hwc->idx;
if (!armv7_pmnc_counter_valid(cpu_pmu, idx)) {
@@
-779,7
+779,7
@@
static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)
u32 pmnc;
struct perf_sample_data data;
struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;
u32 pmnc;
struct perf_sample_data data;
struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;
- struct pmu_hw_events *cpuc =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *cpuc =
this_cpu_ptr(cpu_pmu->hw_events
);
struct pt_regs *regs;
int idx;
struct pt_regs *regs;
int idx;
@@
-839,7
+839,7
@@
static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)
static void armv7pmu_start(struct arm_pmu *cpu_pmu)
{
unsigned long flags;
static void armv7pmu_start(struct arm_pmu *cpu_pmu)
{
unsigned long flags;
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
raw_spin_lock_irqsave(&events->pmu_lock, flags);
/* Enable all counters */
raw_spin_lock_irqsave(&events->pmu_lock, flags);
/* Enable all counters */
@@
-850,7
+850,7
@@
static void armv7pmu_start(struct arm_pmu *cpu_pmu)
static void armv7pmu_stop(struct arm_pmu *cpu_pmu)
{
unsigned long flags;
static void armv7pmu_stop(struct arm_pmu *cpu_pmu)
{
unsigned long flags;
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
raw_spin_lock_irqsave(&events->pmu_lock, flags);
/* Disable all counters */
raw_spin_lock_irqsave(&events->pmu_lock, flags);
/* Disable all counters */
@@
-1283,7
+1283,7
@@
static void krait_pmu_disable_event(struct perf_event *event)
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
/* Disable counter and interrupt */
raw_spin_lock_irqsave(&events->pmu_lock, flags);
/* Disable counter and interrupt */
raw_spin_lock_irqsave(&events->pmu_lock, flags);
@@
-1309,7
+1309,7
@@
static void krait_pmu_enable_event(struct perf_event *event)
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
- struct pmu_hw_events *events =
cpu_pmu->get_hw_events(
);
+ struct pmu_hw_events *events =
this_cpu_ptr(cpu_pmu->hw_events
);
/*
* Enable counter and interrupt, and set the counter to count
/*
* Enable counter and interrupt, and set the counter to count