hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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"
This commit is contained in:
Linus Torvalds 2018-07-13 13:36:36 -07:00
parent aa0a3247c0 5e18e41297
commit 3951dbf232
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clocksource/arm_arch_timer.c
View File

@ -735,7 +735,7 @@ static void __arch_timer_setup(unsigned type,
clk->features |= CLOCK_EVT_FEAT_DYNIRQ; clk->features |= CLOCK_EVT_FEAT_DYNIRQ;
clk->name = "arch_mem_timer"; clk->name = "arch_mem_timer";
clk->rating = 400; clk->rating = 400;
clk->cpumask = cpu_all_mask; clk->cpumask = cpu_possible_mask;
if (arch_timer_mem_use_virtual) { if (arch_timer_mem_use_virtual) {
clk->set_state_shutdown = arch_timer_shutdown_virt_mem; clk->set_state_shutdown = arch_timer_shutdown_virt_mem;
clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem; clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem;

3
kernel/time/tick-common.c
View File

@ -277,8 +277,7 @@ static bool tick_check_preferred(struct clock_event_device *curdev,
*/ */
return !curdev || return !curdev ||
newdev->rating > curdev->rating || newdev->rating > curdev->rating ||
(!cpumask_equal(curdev->cpumask, newdev->cpumask) && !cpumask_equal(curdev->cpumask, newdev->cpumask);
!tick_check_percpu(curdev, newdev, smp_processor_id()));
} }
/* /*