---

yaml --- r: 277038 b: refs/heads/master c: 2e64694 h: refs/heads/master v: v3
git-mirror · Dec 23, 2011 · 325205a · 325205a
1 parent cd7dd38
commit 325205a
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: 55205c916e179e09773d98d290334d319f45ac6b
+refs/heads/master: 2e64694de21a812d637dcbea4471ad1f7897b049
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel.c b/trunk/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1169,7 +1169,7 @@ __intel_shared_reg_get_constraints(struct cpu_hw_events *cpuc,
 		 */
 		c = &unconstrained;
 	} else if (intel_try_alt_er(event, orig_idx)) {
-		raw_spin_unlock(&era->lock);
+		raw_spin_unlock_irqrestore(&era->lock, flags);
 		goto again;
 	}
 	raw_spin_unlock_irqrestore(&era->lock, flags);