lkml.org 
[lkml]   [2017]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 6/9] s390: switch topology_timer to a modern timer
Date
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/s390/kernel/topology.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index bb47c92476f0..4a0e867fca2b 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -289,7 +289,7 @@ 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 (ptf(PTF_CHECK))
topology_schedule_update();
@@ -297,7 +297,7 @@ static void topology_timer_fn(unsigned long ignored)
}

static struct timer_list topology_timer =
- TIMER_DEFERRED_INITIALIZER(topology_timer_fn, 0, 0);
+ INIT_TIMER(topology_timer_fn, 0, TIMER_DEFERRABLE);

static atomic_t topology_poll = ATOMIC_INIT(0);

--
2.11.0
\
 
 \ /
  Last update: 2017-05-16 13:49    [W:0.197 / U:0.028 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site