From 7506dbbaed7d23c08efa4eb4c48cf3226ae973de Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Wed, 27 Feb 2013 16:48:42 +0000
Subject: [PATCH] --- yaml --- r: 367223 b: refs/heads/master c:
 9344de1b1c64b2217f3b15508266deff2a8d6c84 h: refs/heads/master i:   367221:
 c7d9ab98884a15315b4dbfb40f7cab4bfc0895db   367219:
 7d6afd3b0e69a9f669a93469d99d45a432c62e24   367215:
 3aa202103442a9ce487afe5431bdbf123f878686 v: v3

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

diff --git a/[refs] b/[refs]
index 70ef2279aa77..55ff47f3bc01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2033dc54e6fffac01f6129c0038c2e78102cf59a
+refs/heads/master: 9344de1b1c64b2217f3b15508266deff2a8d6c84
diff --git a/trunk/arch/metag/kernel/perf/perf_event.c b/trunk/arch/metag/kernel/perf/perf_event.c
index 6210126de78a..54fde35b4b9c 100644
--- a/trunk/arch/metag/kernel/perf/perf_event.c
+++ b/trunk/arch/metag/kernel/perf/perf_event.c
@@ -22,9 +22,9 @@
 #include <linux/slab.h>
 
 #include <asm/core_reg.h>
-#include <asm/hwthread.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/processor.h>
 
 #include "perf_event.h"
 
@@ -651,7 +651,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
 	}
 
 	tmp = ((config & 0xf) << 28) |
-			((1 << 24) << cpu_2_hwthread_id[get_cpu()]);
+			((1 << 24) << hard_processor_id());
 	if (metag_pmu->max_period)
 		/*
 		 * Cores supporting overflow interrupts may have had the counter