[PATCH 5/9] powerpc/numa: switch topology_timer to modern timer
From: Christoph Hellwig <hch@lst.de>
Date: 2017-05-16 11:50:01
Also in:
linux-s390, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/mm/numa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 371792e4418f..93a11227716b 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c@@ -1437,7 +1437,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 *timer) { if (prrn_enabled && cpumask_weight(&cpu_associativity_changes_mask)) topology_schedule_update();
@@ -1447,8 +1447,7 @@ 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 = INIT_TIMER(topology_timer_fn, 0, 0); static void reset_topology_timer(void) {
--
2.11.0