Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7578ed02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents d2bac6ab 2e64694d

arch/arm/oprofile/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ __intel_shared_reg_get_constraints(struct cpu_hw_events *cpuc, 
		 */

		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);