Merge remote-tracking branch 'tip/timers/core' into afs-next

[mirror_ubuntu-bionic-kernel.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b95c584ce19d33b658a9a546ecb3de64ff93d23a..73016451f33005844ad13b31f22a31011ccaccaa 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1438,7 +1438,6 @@ out:
 
 int arch_update_cpu_topology(void)
 {
-       lockdep_assert_cpus_held();
        return numa_update_cpu_topology(true);
 }
 
@@ -1453,7 +1452,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();
@@ -1463,14 +1462,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 + 60 * HZ;
-       mod_timer(&topology_timer, topology_timer.expires);
+       mod_timer(&topology_timer, jiffies + 60 * HZ);
 }
 
 #ifdef CONFIG_SMP
@@ -1530,7 +1526,8 @@ int start_topology_update(void)
                        prrn_enabled = 0;
                        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();
                }
        }