Skip to contentSkip to conversation

timer fixes

GIT PULL Ingo Molnar 1 participant 1 message Jul 13, 2018

Subsystems (3)
lore
Share & tools
lore

Ingo Molnar

author maintainer
#0 lore raw

Linus,

Please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

# HEAD: 5e18e412973d6bb1804de1d4d30a891c774b006e clocksource: arm_arch_timer: Set arch_mem_timer cpumask to cpu_possible_mask

A clocksource driver fix and a revert.

Thanks,

Ingo

------------------>
Sudeep Holla (2):
Revert "tick: Prefer a lower rating device only if it's CPU local device"
clocksource: arm_arch_timer: Set arch_mem_timer cpumask to cpu_possible_mask

 drivers/clocksource/arm_arch_timer.c | 2 +-
 kernel/time/tick-common.c            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/arm_arch_timer.c +1 -1
index 57cb2f00fc07..d8c7f5750cdb 100644
@@ -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
index b7005dd21ec1..14de3727b18e 100644
@@ -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);
 }
 
 /*