]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'renesas-clocksource-fixes-for-v3.12' into next
authorSimon Horman <horms+renesas@verge.net.au>
Mon, 30 Sep 2013 07:23:15 +0000 (16:23 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 30 Sep 2013 07:23:15 +0000 (16:23 +0900)
Renesas clocksource fixes for v3.12

* em_sti: Set cpu_possible_mask to fix SMP broadcast

  This resolves a regression introduced by
  f7db706 ("ARM: 7674/1: smp: Avoid dummy clockevent being preferred over
  real hardware clock-event").

  This problem has been present since v3.9-rc4.

drivers/clocksource/em_sti.c

index b9c81b7c3a3bfa5a251129e42c687b1e0aeeb851..3a5909c12d420dbbb6f54f011882303ba4a48a62 100644 (file)
@@ -301,7 +301,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p)
        ced->name = dev_name(&p->pdev->dev);
        ced->features = CLOCK_EVT_FEAT_ONESHOT;
        ced->rating = 200;
-       ced->cpumask = cpumask_of(0);
+       ced->cpumask = cpu_possible_mask;
        ced->set_next_event = em_sti_clock_event_next;
        ced->set_mode = em_sti_clock_event_mode;