alpha: convert perf_event to use local_t
Updates the Alpha perf_event code to match the changes
recently made to the core perf_event code in commit
e78505958c
.
Signed-off-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
59b25ed914
commit
7b598cdd03
|
@ -241,20 +241,20 @@ static inline unsigned long alpha_read_pmc(int idx)
|
||||||
static int alpha_perf_event_set_period(struct perf_event *event,
|
static int alpha_perf_event_set_period(struct perf_event *event,
|
||||||
struct hw_perf_event *hwc, int idx)
|
struct hw_perf_event *hwc, int idx)
|
||||||
{
|
{
|
||||||
long left = atomic64_read(&hwc->period_left);
|
long left = local64_read(&hwc->period_left);
|
||||||
long period = hwc->sample_period;
|
long period = hwc->sample_period;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (unlikely(left <= -period)) {
|
if (unlikely(left <= -period)) {
|
||||||
left = period;
|
left = period;
|
||||||
atomic64_set(&hwc->period_left, left);
|
local64_set(&hwc->period_left, left);
|
||||||
hwc->last_period = period;
|
hwc->last_period = period;
|
||||||
ret = 1;
|
ret = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(left <= 0)) {
|
if (unlikely(left <= 0)) {
|
||||||
left += period;
|
left += period;
|
||||||
atomic64_set(&hwc->period_left, left);
|
local64_set(&hwc->period_left, left);
|
||||||
hwc->last_period = period;
|
hwc->last_period = period;
|
||||||
ret = 1;
|
ret = 1;
|
||||||
}
|
}
|
||||||
|
@ -269,7 +269,7 @@ static int alpha_perf_event_set_period(struct perf_event *event,
|
||||||
if (left > (long)alpha_pmu->pmc_max_period[idx])
|
if (left > (long)alpha_pmu->pmc_max_period[idx])
|
||||||
left = alpha_pmu->pmc_max_period[idx];
|
left = alpha_pmu->pmc_max_period[idx];
|
||||||
|
|
||||||
atomic64_set(&hwc->prev_count, (unsigned long)(-left));
|
local64_set(&hwc->prev_count, (unsigned long)(-left));
|
||||||
|
|
||||||
alpha_write_pmc(idx, (unsigned long)(-left));
|
alpha_write_pmc(idx, (unsigned long)(-left));
|
||||||
|
|
||||||
|
@ -300,10 +300,10 @@ static unsigned long alpha_perf_event_update(struct perf_event *event,
|
||||||
long delta;
|
long delta;
|
||||||
|
|
||||||
again:
|
again:
|
||||||
prev_raw_count = atomic64_read(&hwc->prev_count);
|
prev_raw_count = local64_read(&hwc->prev_count);
|
||||||
new_raw_count = alpha_read_pmc(idx);
|
new_raw_count = alpha_read_pmc(idx);
|
||||||
|
|
||||||
if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
|
if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
|
||||||
new_raw_count) != prev_raw_count)
|
new_raw_count) != prev_raw_count)
|
||||||
goto again;
|
goto again;
|
||||||
|
|
||||||
|
@ -316,8 +316,8 @@ again:
|
||||||
delta += alpha_pmu->pmc_max_period[idx] + 1;
|
delta += alpha_pmu->pmc_max_period[idx] + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
atomic64_add(delta, &event->count);
|
local64_add(delta, &event->count);
|
||||||
atomic64_sub(delta, &hwc->period_left);
|
local64_sub(delta, &hwc->period_left);
|
||||||
|
|
||||||
return new_raw_count;
|
return new_raw_count;
|
||||||
}
|
}
|
||||||
|
@ -636,7 +636,7 @@ static int __hw_perf_event_init(struct perf_event *event)
|
||||||
if (!hwc->sample_period) {
|
if (!hwc->sample_period) {
|
||||||
hwc->sample_period = alpha_pmu->pmc_max_period[0];
|
hwc->sample_period = alpha_pmu->pmc_max_period[0];
|
||||||
hwc->last_period = hwc->sample_period;
|
hwc->last_period = hwc->sample_period;
|
||||||
atomic64_set(&hwc->period_left, hwc->sample_period);
|
local64_set(&hwc->period_left, hwc->sample_period);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue