From patchwork Tue May 16 11:48:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 762912 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wRwzj6l4dz9s5L for ; Tue, 16 May 2017 22:02:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="FL4hNUW/"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wRwzj5fW6zDqZp for ; Tue, 16 May 2017 22:02:09 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="FL4hNUW/"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wRwhH0yxczDqbB for ; Tue, 16 May 2017 21:48:47 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="FL4hNUW/"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xn26L5vb/YZIsiJ8jUpAITDFoIqpl2JzoiRlqKRx/N4=; b=FL4hNUW/uCvJVIOppIqUwBOSq VYET6JAVS85KQ69OBCKqo7wMZL85OOGjlmECC9s3YaFGrFqhfNAUPczpEU+L8GDQpY1Di4MPN7Fxj CRMG5rBh75NEwddp6A90DogVxr59GWK0+lFbMrFZ0wI+Vjudo90DDkHNeRe5moYel5uYmHtiXCP/L UxGtYKZ45LLEa6tnhcaF7QKipNtINJtp/SepAnrnDcCblemg1oJxpuwIjB3Sup5/ESzfl0ideYtVt 5x2H4AE7kY2nb/5lBgGREt47r3qlVf7p4vKTdPBwRFuvXDhIje/S2SkiSOZVR86yloYKvHTFEhM3o t5pVjJT+A==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dAay4-0001VE-O2; Tue, 16 May 2017 11:48:45 +0000 From: Christoph Hellwig To: Thomas Gleixner 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 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tejun Heo , linuxppc-dev@lists.ozlabs.org, Mark Gross , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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