From eede986f203659f01f1722f7e3609c8a27885fa5 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Tue, 24 Nov 2009 20:38:22 +0100
Subject: [PATCH] --- yaml --- r: 169780 b: refs/heads/master c:
 fe6126722718e51fba4879517c11ac12d9775bcc h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f2cf61257a0..b45c7489ba2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1261a02a0c0ab8e643125705f0d1d83e5090e4d1
+refs/heads/master: fe6126722718e51fba4879517c11ac12d9775bcc
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index accfd7bfe387..35df94e344f2 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -3914,7 +3914,7 @@ void perf_swevent_put_recursion_context(int rctx)
 {
 	struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
 	barrier();
-	cpuctx->recursion[rctx]++;
+	cpuctx->recursion[rctx]--;
 	put_cpu_var(perf_cpu_context);
 }
 EXPORT_SYMBOL_GPL(perf_swevent_put_recursion_context);