diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-13 13:36:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-13 13:36:36 -0700 |
| commit | 3951dbf232e8500bef27f77437fd5d04b67cc6d1 (patch) | |
| tree | 23ee5392907aba85214040a836fcc09d00940609 /kernel | |
| parent | aa0a3247c01535303fc39c2bf0beb4493688a314 (diff) | |
| parent | 5e18e412973d6bb1804de1d4d30a891c774b006e (diff) | |
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"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/tick-common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index b7005dd21ec1..14de3727b18e 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -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); } /* |