---

yaml --- r: 367223 b: refs/heads/master c: 9344de1 h: refs/heads/master i: 367221: c7d9ab9 367219: 7d6afd3 367215: 3aa2021 v: v3
git-mirror · Mar 15, 2013 · 7506dbb · 7506dbb
1 parent ec47a4c
commit 7506dbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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