From 6014464521cafbb135314c69743a572b74a10c0c Mon Sep 17 00:00:00 2001
From: Daniel Baluta <dbaluta@ixiacom.com>
Date: Wed, 6 Feb 2013 23:29:20 +0200
Subject: [PATCH] --- yaml --- r: 350120 b: refs/heads/master c:
 02e176af92f3e2e9ec3a48792036566af2dcd534 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f2450b829b6c..507cc15a2207 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85df3b3769222894e9692b383c7af124b7721086
+refs/heads/master: 02e176af92f3e2e9ec3a48792036566af2dcd534
diff --git a/trunk/kernel/events/hw_breakpoint.c b/trunk/kernel/events/hw_breakpoint.c
index fe8a916507ed..a64f8aeb5c1f 100644
--- a/trunk/kernel/events/hw_breakpoint.c
+++ b/trunk/kernel/events/hw_breakpoint.c
@@ -676,7 +676,7 @@ int __init init_hw_breakpoint(void)
  err_alloc:
 	for_each_possible_cpu(err_cpu) {
 		for (i = 0; i < TYPE_MAX; i++)
-			kfree(per_cpu(nr_task_bp_pinned[i], cpu));
+			kfree(per_cpu(nr_task_bp_pinned[i], err_cpu));
 		if (err_cpu == cpu)
 			break;
 	}