From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248AbdEPLtG (ORCPT ); Tue, 16 May 2017 07:49:06 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:59675 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbdEPLss (ORCPT ); Tue, 16 May 2017 07:48:48 -0400 From: Christoph Hellwig To: Thomas Gleixner Cc: Mark Gross , Tejun Heo , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/9] s390: switch lgr timer to a modern timer Date: Tue, 16 May 2017 13:48:10 +0200 Message-Id: <20170516114812.10660-8-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170516114812.10660-1-hch@lst.de> References: <20170516114812.10660-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- 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