[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2e64694de21a812d637dcbea4471ad1f7897b049@git.kernel.org>
Date: Fri, 23 Dec 2011 23:32:15 -0800
From: tip-bot for Robert Richter <robert.richter@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, eranian@...gle.com, hpa@...or.com,
mingo@...hat.com, robert.richter@....com, peterz@...radead.org,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/urgent] perf/x86: Fix raw_spin_unlock_irqrestore() usage
Commit-ID: 2e64694de21a812d637dcbea4471ad1f7897b049
Gitweb: http://git.kernel.org/tip/2e64694de21a812d637dcbea4471ad1f7897b049
Author: Robert Richter <robert.richter@....com>
AuthorDate: Fri, 23 Dec 2011 14:24:25 +0100
Committer: Ingo Molnar <mingo@...e.hu>
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().
Signed-off-by: Robert Richter <robert.richter@....com>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/1324646665-13334-1-git-send-email-robert.richter@amd.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/perf_event_intel.c | 2 +-
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 8d601b1..121f1be 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists