Skip to contentSkip to conversation

perf, x86: Fix raw_spin_unlock_irqrestore() usage

PATCH In review Robert Richter 1 participant 2 messages Dec 23, 2011 – Dec 24, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf, x86: Fix raw_spin_unlock_irqrestore() usage

Use raw_spin_unlock_irqrestore() as equivalent to
raw_spin_lock_irqsave().

---
 arch/x86/kernel/cpu/perf_event_intel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
index 2c3bf53..31286bc 100644
@@ -1169,7 +1169,7 @@ again:
 		 */
 		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);
Signature · 1 line
1.7.8
#1 lore raw

[tip:perf/urgent] perf/x86: Fix raw_spin_unlock_irqrestore() usage

Commit-ID:  2e64694de21a812d637dcbea4471ad1f7897b049
Gitweb:     http://git.kernel.org/tip/2e64694de21a812d637dcbea4471ad1f7897b049
Author:     Robert Richter <[email protected]>
AuthorDate: Fri, 23 Dec 2011 14:24:25 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 23 Dec 2011 17:57:01 +0100

perf/x86: Fix raw_spin_unlock_irqrestore() usage

Use raw_spin_unlock_irqrestore() as equivalent to
raw_spin_lock_irqsave().

---
 arch/x86/kernel/cpu/perf_event_intel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
index 8d601b1..121f1be 100644
@@ -1169,7 +1169,7 @@ again:
 		 */
 		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);