]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
perf/x86: Fix raw_spin_unlock_irqrestore() usage
authorRobert Richter <robert.richter@amd.com>
Fri, 23 Dec 2011 13:24:25 +0000 (14:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Dec 2011 16:57:01 +0000 (17:57 +0100)
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>
arch/x86/kernel/cpu/perf_event_intel.c

index 8d601b18bf9f43688f2a6c5cb90994e00a4fa8d8..121f1be4da19430426c45d1c17fce6d8d2d7037e 100644 (file)
@@ -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);