perf fixes
Subsystems (4)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
Thanks,
Ingo
------------------>
Robert Richter (1):
perf/x86: Fix raw_spin_unlock_irqrestore() usage
Vladimir Zapolskiy (1):
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
arch/arm/oprofile/common.c | 2 +- arch/sh/oprofile/common.c | 4 ++-- arch/x86/kernel/cpu/perf_event_intel.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/oprofile/common.c +1 -1
@@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)return oprofile_perf_init (ops); } -void __exit oprofile_arch_exit(void) +void oprofile_arch_exit (void ) {oprofile_perf_exit (); }
arch/sh/oprofile/common.c +2 -2
@@ -49,7 +49,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)return oprofile_perf_init (ops); } -void __exit oprofile_arch_exit(void) +void oprofile_arch_exit (void ) {oprofile_perf_exit ();kfree (sh_pmu_op_name);
@@ -60,5 +60,5 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = sh_backtrace; return -ENODEV; } -void __exit oprofile_arch_exit(void) {} +void oprofile_arch_exit (void ) {}#endif /* CONFIG_HW_PERF_EVENTS */
arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -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);