---

yaml --- r: 361360 b: refs/heads/master c: 2a6e06b h: refs/heads/master v: v3
git-mirror · Mar 17, 2013 · 8aabf2f · 8aabf2f
1 parent da7c810
commit 8aabf2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08637024ab77f7defff1627cc8aedc2c6679ad8a
+refs/heads/master: 2a6e06b2aed6995af401dcd4feb5e79a0c7ea554
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -732,8 +732,10 @@ void intel_ds_init(void)
 
 void perf_restore_debug_store(void)
 {
+	struct debug_store *ds = __this_cpu_read(cpu_hw_events.ds);
+
 	if (!x86_pmu.bts && !x86_pmu.pebs)
 		return;
 
-	init_debug_store_on_cpu(smp_processor_id());
+	wrmsrl(MSR_IA32_DS_AREA, (unsigned long)ds);
 }