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

Commit 3951dbf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fixes from Ingo Molnar:
 "A clocksource driver fix and a revert"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: arm_arch_timer: Set arch_mem_timer cpumask to cpu_possible_mask
  Revert "tick: Prefer a lower rating device only if it's CPU local device"
parents aa0a3247 5e18e412

drivers/clocksource/arm_arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static void __arch_timer_setup(unsigned type, 
		clk->features |= CLOCK_EVT_FEAT_DYNIRQ;

		clk->name = "arch_mem_timer";

		clk->rating = 400;

		clk->cpumask = cpu_all_mask;

		clk->cpumask = cpu_possible_mask;

		if (arch_timer_mem_use_virtual) {

			clk->set_state_shutdown = arch_timer_shutdown_virt_mem;

			clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem;

kernel/time/tick-common.c

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ static bool tick_check_preferred(struct clock_event_device *curdev, 
	 */

	return !curdev ||

		newdev->rating > curdev->rating ||

	       (!cpumask_equal(curdev->cpumask, newdev->cpumask) &&

	        !tick_check_percpu(curdev, newdev, smp_processor_id()));

	       !cpumask_equal(curdev->cpumask, newdev->cpumask);

}



/*