summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2011-12-23 14:24:25 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-23 17:57:01 +0100
commit2e64694de21a812d637dcbea4471ad1f7897b049 (patch)
tree8052c0a8f9d0b7606f425cba6c97e1ae22cbf752 /arch/x86
parent55205c916e179e09773d98d290334d319f45ac6b (diff)
downloadlinux-3.10-2e64694de21a812d637dcbea4471ad1f7897b049.tar.gz
linux-3.10-2e64694de21a812d637dcbea4471ad1f7897b049.tar.bz2
linux-3.10-2e64694de21a812d637dcbea4471ad1f7897b049.zip
perf/x86: Fix raw_spin_unlock_irqrestore() usage
Use raw_spin_unlock_irqrestore() as equivalent to raw_spin_lock_irqsave(). Signed-off-by: Robert Richter <robert.richter@amd.com> Cc: Stephane Eranian <eranian@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1324646665-13334-1-git-send-email-robert.richter@amd.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 8d601b18bf9..121f1be4da1 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -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);