[PATCH 7/9] s390: switch lgr timer to a modern timer

From: Christoph Hellwig
Date: Tue May 16 2017 - 07:49:10 EST


Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
arch/s390/kernel/lgr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c
index ae7dff110054..147124c05f28 100644
--- a/arch/s390/kernel/lgr.c
+++ b/arch/s390/kernel/lgr.c
@@ -153,14 +153,14 @@ static void lgr_timer_set(void);
/*
* LGR timer callback
*/
-static void lgr_timer_fn(unsigned long ignored)
+static void lgr_timer_fn(struct timer_list *timer)
{
lgr_info_log();
lgr_timer_set();
}

static struct timer_list lgr_timer =
- TIMER_DEFERRED_INITIALIZER(lgr_timer_fn, 0, 0);
+ INIT_TIMER(lgr_timer_fn, 0, TIMER_DEFERRABLE);

/*
* Setup next LGR timer
--
2.11.0