---

yaml --- r: 147503 b: refs/heads/master c: 10989fb h: refs/heads/master i: 147501: 006fd4c 147499: 0fa445e 147495: 6ec8445 147487: 7b4099a v: v3
git-mirror · May 25, 2009 · 1ea3c8f · 1ea3c8f
1 parent 83de5a6
commit 1ea3c8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab423e0eaca827fbd201ca4ae7d4f8573a366b2
+refs/heads/master: 10989fb2451763fae6f42d85fa6106c8fd010cf5
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -924,14 +924,13 @@ void perf_counter_task_sched_out(struct task_struct *task,
 	struct perf_counter_context *next_ctx;
 	struct pt_regs *regs;
 
+	regs = task_pt_regs(task);
+	perf_swcounter_event(PERF_COUNT_CONTEXT_SWITCHES, 1, 1, regs, 0);
+
 	if (likely(!ctx || !cpuctx->task_ctx))
 		return;
 
 	update_context_time(ctx);
-
-	regs = task_pt_regs(task);
-	perf_swcounter_event(PERF_COUNT_CONTEXT_SWITCHES, 1, 1, regs, 0);
-
 	next_ctx = next->perf_counter_ctxp;
 	if (next_ctx && context_equiv(ctx, next_ctx)) {
 		task->perf_counter_ctxp = next_ctx;