apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Browse Source
This commit is contained in:
Ingo Molnar
2012-01-08 12:31:24 +01:00
parent 675eef66e3 2e885057b7
commit 636f0c70f2
277 changed files with 3672 additions and 1433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/kernel/cpu/perf_event_intel.c
+1 -1
View File
@@ -1165,7 +1165,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);