Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / time_32.c

diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index 18147a5523d947736a3e7c0815a7eeb3526ec271..8caf45ee81d9e34417bc8a65f860c730521a6dc1 100644 (file)
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -194,7 +194,7 @@ static __init int setup_timer_cs(void)
 static void percpu_ce_setup(enum clock_event_mode mode,
                        struct clock_event_device *evt)
 {
-       int cpu = __first_cpu(evt->cpumask);
+       int cpu = cpumask_first(evt->cpumask);
 
        switch (mode) {
                case CLOCK_EVT_MODE_PERIODIC:
@@ -214,7 +214,7 @@ static void percpu_ce_setup(enum clock_event_mode mode,
 static int percpu_ce_set_next_event(unsigned long delta,
                                    struct clock_event_device *evt)
 {
-       int cpu = __first_cpu(evt->cpumask);
+       int cpu = cpumask_first(evt->cpumask);
        unsigned int next = (unsigned int)delta;
 
        sparc_config.load_profile_irq(cpu, next);