Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 23:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix raw_spin_unlock_irqrestore() usage
  oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
This commit is contained in:
Linus Torvalds 2011-12-29 17:09:16 -08:00
commit 7578ed02e4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/oprofile/common.c
View File

@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
return oprofile_perf_init(ops); return oprofile_perf_init(ops);
} }
void __exit oprofile_arch_exit(void) void oprofile_arch_exit(void)
{ {
oprofile_perf_exit(); oprofile_perf_exit();
} }

4
arch/sh/oprofile/common.c
View File

@ -49,7 +49,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
return oprofile_perf_init(ops); return oprofile_perf_init(ops);
} }
void __exit oprofile_arch_exit(void) void oprofile_arch_exit(void)
{ {
oprofile_perf_exit(); oprofile_perf_exit();
kfree(sh_pmu_op_name); kfree(sh_pmu_op_name);
@ -60,5 +60,5 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
ops->backtrace = sh_backtrace; ops->backtrace = sh_backtrace;
return -ENODEV; return -ENODEV;
} }
void __exit oprofile_arch_exit(void) {} void oprofile_arch_exit(void) {}
#endif /* CONFIG_HW_PERF_EVENTS */ #endif /* CONFIG_HW_PERF_EVENTS */

2
arch/x86/kernel/cpu/perf_event_intel.c
View File

@ -1169,7 +1169,7 @@ again:
*/ */
c = &unconstrained; c = &unconstrained;
} else if (intel_try_alt_er(event, orig_idx)) { } else if (intel_try_alt_er(event, orig_idx)) {
raw_spin_unlock(&era->lock); raw_spin_unlock_irqrestore(&era->lock, flags);
goto again; goto again;
} }
raw_spin_unlock_irqrestore(&era->lock, flags); raw_spin_unlock_irqrestore(&era->lock, flags);