From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Christoph Hellwig Subject: [PATCH 6/9] s390: switch topology_timer to a modern timer Date: Tue, 16 May 2017 13:48:09 +0200 Message-Id: <20170516114812.10660-7-hch@lst.de> In-Reply-To: <20170516114812.10660-1-hch@lst.de> References: <20170516114812.10660-1-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , List-Archive: To: Thomas Gleixner Cc: Mark Gross , Tejun Heo , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: Signed-off-by: Christoph Hellwig --- 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