---

yaml --- r: 312246 b: refs/heads/master c: 76958a6 h: refs/heads/master v: v3
git-mirror · Jun 18, 2012 · 8896f7d · 8896f7d
1 parent 57290fe
commit 8896f7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4983955c049d1debe5f6bee3aeb54ff5942fcd39
+refs/heads/master: 76958a61e42fb6277a8431eb17e4bdb24176f1b7
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -823,7 +823,7 @@ static inline void x86_assign_hw_event(struct perf_event *event,
 	} else {
 		hwc->config_base = x86_pmu_config_addr(hwc->idx);
 		hwc->event_base  = x86_pmu_event_addr(hwc->idx);
-		hwc->event_base_rdpmc = x86_pmu_addr_offset(hwc->idx);
+		hwc->event_base_rdpmc = hwc->idx;
 	}
 }