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

Commit f97d1045 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of... 

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

Pull perf and timer fixes from Ingo Molnar:
 "A fix for a posix CPU timers bug, and a perf printk message fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix bogus kernel printk, again

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix_cpu_timer: Exit early when process has been reaped
parents a7bf89a1 eb019503 2c13ce8f

arch/x86/events/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -263,7 +263,7 @@ static bool check_hw_exists(void) 




msr_fail:

msr_fail:

	pr_cont("Broken PMU hardware detected, using software events only.\n");

	pr_cont("Broken PMU hardware detected, using software events only.\n");

	pr_info("%sFailed to access perfctr msr (MSR %x is %Lx)\n",

	printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",

		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,

		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,

		reg, val_new);

		reg, val_new);

kernel/time/posix-cpu-timers.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -777,6 +777,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) 
			timer->it.cpu.expires = 0;

			timer->it.cpu.expires = 0;

			sample_to_timespec(timer->it_clock, timer->it.cpu.expires,

			sample_to_timespec(timer->it_clock, timer->it.cpu.expires,

					   &itp->it_value);

					   &itp->it_value);

			return;

		} else {

		} else {

			cpu_timer_sample_group(timer->it_clock, p, &now);

			cpu_timer_sample_group(timer->it_clock, p, &now);

			unlock_task_sighand(p, &flags);

			unlock_task_sighand(p, &flags);