Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index eb604b3574fa86f85574498ff921e3cac2982a91..adb6364f40911b984f05f5b989ca0c54af5efdd1 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1491,7 +1491,7 @@ static void topology_schedule_update(void)
        schedule_work(&topology_work);
 }
 
-static void topology_timer_fn(unsigned long ignored)
+static void topology_timer_fn(struct timer_list *unused)
 {
        if (prrn_enabled && cpumask_weight(&cpu_associativity_changes_mask))
                topology_schedule_update();
@@ -1501,14 +1501,11 @@ static void topology_timer_fn(unsigned long ignored)
                reset_topology_timer();
        }
 }
-static struct timer_list topology_timer =
-       TIMER_INITIALIZER(topology_timer_fn, 0, 0);
+static struct timer_list topology_timer;
 
 static void reset_topology_timer(void)
 {
-       topology_timer.data = 0;
-       topology_timer.expires = jiffies + topology_timer_secs * HZ;
-       mod_timer(&topology_timer, topology_timer.expires);
+       mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
 }
 
 #ifdef CONFIG_SMP
@@ -1567,7 +1564,8 @@ int start_topology_update(void)
                if (!vphn_enabled) {
                        vphn_enabled = 1;
                        setup_cpu_associativity_change_counters();
-                       init_timer_deferrable(&topology_timer);
+                       timer_setup(&topology_timer, topology_timer_fn,
+                                   TIMER_DEFERRABLE);
                        reset_topology_timer();
                }
        }