From patchwork Wed Oct 4 23:27:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 821531 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 3y6svP6QJlz9t2Z for ; Thu, 5 Oct 2017 10:44:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="N01WJ0bL"; 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 3y6svP5DRWzDr2M for ; Thu, 5 Oct 2017 10:44:49 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="N01WJ0bL"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=chromium.org (client-ip=2607:f8b0:400e:c05::229; helo=mail-pg0-x229.google.com; envelope-from=keescook@chromium.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="N01WJ0bL"; dkim-atps=neutral Received: from mail-pg0-x229.google.com (mail-pg0-x229.google.com [IPv6:2607:f8b0:400e:c05::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y6sX44VRGzDr1y for ; Thu, 5 Oct 2017 10:28:04 +1100 (AEDT) Received: by mail-pg0-x229.google.com with SMTP id v13so7324205pgq.6 for ; Wed, 04 Oct 2017 16:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8cZbW/NVZyz3UVLg6X+8KLxDaf0Gq86t5+0lrN6rL0U=; b=N01WJ0bLzfsC9/LQfS5Smolsgoz7e6SHi3bSoL690wgIJe+se2+4IeU0TXcjr+8SR/ hYob/sSTbKwy+wJRFsZHptX0s3iHPMcdijtlnhuE9PlH+JXpa786MgZxF5Qihi7Ql9/q v6eFs0nwAI6VNch5ZBSsY9X8vRBup4znqM01o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8cZbW/NVZyz3UVLg6X+8KLxDaf0Gq86t5+0lrN6rL0U=; b=f1hAioGMBsyjX2Gnav0gIwH/AqxNDuRneAKAlzHPdspjOsCbiPNge5TDCJw4rLMzHt jTqPiyZiMdGl7MRd4BAJUlJmSHiRJqbA5PKmGL3inQIqHpU+r37qRWJ3l3i6faiDQf6N MBCPFuCyVmlL3n+AIbHVrdN590uBfr8ituPiaDg5bn4qUSy6cFJhjQrhv1yukTvtf+5x 8/l7k1smuIsm+OttEnZkfUi8f8O0n9vJGBCqg/PnKJGOs8Mf5FeY+o4FJ9KcdBEIVvj5 h30BQmA5DQDLtqUjSj7XSfEGee3TDCgCj0eS9T8ja5cgQ0w26Ls5mDSCxsulKBjlovZz qUrA== X-Gm-Message-State: AMCzsaXFN1fXPA1veUde7WFw1ezwOGT7pS8+x3As1utXc9oSr7sNFkOd sKBtsUcZiv6MZOADar285yG9oA== X-Google-Smtp-Source: AOwi7QDmXblToLPAwFlwJ+KFgWlToFfBdX54O2RtckUfJ8j+hHQNEfgeUGUna1kSnkTlmlMhZruVpg== X-Received: by 10.101.78.130 with SMTP id b2mr13085633pgs.160.1507159682431; Wed, 04 Oct 2017 16:28:02 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id v14sm10213985pgc.78.2017.10.04.16.27.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 16:27:57 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Subject: [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER Date: Wed, 4 Oct 2017 16:27:01 -0700 Message-Id: <1507159627-127660-8-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507159627-127660-1-git-send-email-keescook@chromium.org> References: <1507159627-127660-1-git-send-email-keescook@chromium.org> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Petr Mladek , Lai Jiangshan , Sebastian Reichel , Kalle Valo , Paul Mackerras , Pavel Machek , linux1394-devel@lists.sourceforge.net, Chris Metcalf , linux-s390@vger.kernel.org, linux-wireless@vger.kernel.org, Mark Gross , Wim Van Sebroeck , Ursula Braun , Geert Uytterhoeven , Viresh Kumar , Harish Patil , Stephen Boyd , Michael Reed , Manish Chopra , Len Brown , Kees Cook , Arnd Bergmann , linux-pm@vger.kernel.org, Heiko Carstens , Tejun Heo , Julian Wiedmann , John Stultz , "James E.J. Bottomley" , linux-watchdog@vger.kernel.org, linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , "Rafael J. Wysocki" , Oleg Nesterov , Ralf Baechle , linux-kernel@vger.kernel.org, Stefan Richter , Guenter Roeck , netdev@vger.kernel.org, Martin Schwidefsky , Andrew Morton , linuxppc-dev@lists.ozlabs.org, Sudip Mukherjee Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Drops the last user of TIMER_INITIALIZER and adapts timer.h to use the internal version. Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Mark Gross Cc: Thomas Gleixner Signed-off-by: Kees Cook Acked-by: mark gross --- drivers/char/tlclk.c | 12 +++++------- include/linux/timer.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index 6210bff46341..8eeb4190207d 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c @@ -184,9 +184,8 @@ static unsigned int telclk_interrupt; static int int_events; /* Event that generate a interrupt */ static int got_event; /* if events processing have been done */ -static void switchover_timeout(unsigned long data); -static struct timer_list switchover_timer = - TIMER_INITIALIZER(switchover_timeout , 0, 0); +static void switchover_timeout(struct timer_list *t); +static struct timer_list switchover_timer; static unsigned long tlclk_timer_data; static struct tlclk_alarms *alarm_events; @@ -805,7 +804,7 @@ static int __init tlclk_init(void) goto out3; } - init_timer(&switchover_timer); + timer_setup(&switchover_timer, switchover_timeout, 0); ret = misc_register(&tlclk_miscdev); if (ret < 0) { @@ -855,9 +854,9 @@ static void __exit tlclk_cleanup(void) } -static void switchover_timeout(unsigned long data) +static void switchover_timeout(struct timer_list *unused) { - unsigned long flags = *(unsigned long *) data; + unsigned long flags = tlclk_timer_data; if ((flags & 1)) { if ((inb(TLCLK_REG1) & 0x08) != (flags & 0x08)) @@ -922,7 +921,6 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id) /* TIMEOUT in ~10ms */ switchover_timer.expires = jiffies + msecs_to_jiffies(10); tlclk_timer_data = inb(TLCLK_REG1); - switchover_timer.data = (unsigned long) &tlclk_timer_data; mod_timer(&switchover_timer, switchover_timer.expires); } else { got_event = 1; diff --git a/include/linux/timer.h b/include/linux/timer.h index 10cc45ca5803..4f7476e4a727 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -87,7 +87,7 @@ struct timer_list { #define DEFINE_TIMER(_name, _function, _expires, _data) \ struct timer_list _name = \ - TIMER_INITIALIZER(_function, _expires, _data) + __TIMER_INITIALIZER(_function, _expires, _data, 0) void init_timer_key(struct timer_list *timer, unsigned int flags, const char *name, struct lock_class_key *key);