From 1ea3c8fbd84aeffb2aecc90ca17f93503648a78a Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 25 May 2009 14:45:28 +0200
Subject: [PATCH] --- yaml --- r: 147503 b: refs/heads/master c:
 10989fb2451763fae6f42d85fa6106c8fd010cf5 h: refs/heads/master i:   147501:
 006fd4c0e3f157f9e1088504b13a227ddd1dab5a   147499:
 0fa445e1bb7eef11b5625831220b68ba2686e8d3   147495:
 6ec8445f322ce132c163fec914f581b7fa77fc37   147487:
 7b4099aae3edebf4aff08ef6a6e41d8bf8555c30 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/perf_counter.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eb7794b25640..0fa8596222a2 100644
--- 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
index 7a7a144870ef..14b1fe984832 100644
--- 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;