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"

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 57cb2f00fc07..d8c7f5750cdb 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -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;
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);
 }
 
 /*