Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 147337
b: refs/heads/master
c: bce379b
h: refs/heads/master
i:
  147335: 0c64bda
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Apr 7, 2009
1 parent 9e6f6e9 commit 2cfc917
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 849691a6cd40270ff5f4a8846d5f6bf8df663ffc
refs/heads/master: bce379bf358738ab8efc8cda2594a299ac685085
7 changes: 5 additions & 2 deletions trunk/kernel/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ static void __perf_counter_disable(void *info)

spin_lock_irqsave(&ctx->lock, flags);

update_context_time(ctx);

/*
* If the counter is on, turn it off.
* If it is in error state, leave it in error state.
Expand Down Expand Up @@ -797,6 +799,8 @@ void perf_counter_task_sched_out(struct task_struct *task, int cpu)
if (likely(!cpuctx->task_ctx))
return;

update_context_time(ctx);

regs = task_pt_regs(task);
perf_swcounter_event(PERF_COUNT_CONTEXT_SWITCHES, 1, 1, regs);
__perf_counter_sched_out(ctx, cpuctx);
Expand Down Expand Up @@ -2336,7 +2340,6 @@ static void task_clock_perf_counter_update(struct perf_counter *counter)
u64 prev, now;
s64 delta;

update_context_time(counter->ctx);
now = counter->ctx->time;

prev = atomic64_xchg(&counter->hw.prev_count, now);
Expand All @@ -2349,7 +2352,6 @@ static int task_clock_perf_counter_enable(struct perf_counter *counter)
struct hw_perf_counter *hwc = &counter->hw;
u64 now;

update_context_time(counter->ctx);
now = counter->ctx->time;

atomic64_set(&hwc->prev_count, now);
Expand All @@ -2372,6 +2374,7 @@ static void task_clock_perf_counter_disable(struct perf_counter *counter)

static void task_clock_perf_counter_read(struct perf_counter *counter)
{
update_context_time(counter->ctx);
task_clock_perf_counter_update(counter);
}

Expand Down

0 comments on commit 2cfc917

Please sign in to comment.