From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbdJENb5 (ORCPT ); Thu, 5 Oct 2017 09:31:57 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55925 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbdJENb4 (ORCPT ); Thu, 5 Oct 2017 09:31:56 -0400 Date: Thu, 5 Oct 2017 06:07:48 -0700 From: tip-bot for Kees Cook Message-ID: Cc: jwi@linux.vnet.ibm.com, ubraun@linux.vnet.ibm.com, sre@kernel.org, pmladek@suse.com, jejb@linux.vnet.ibm.com, gregkh@linuxfoundation.org, stefanr@s5r6.in-berlin.de, tglx@linutronix.de, akpm@linux-foundation.org, sudipm.mukherjee@gmail.com, ralf@linux-mips.org, rjw@rjwysocki.net, kvalo@qca.qualcomm.com, oleg@redhat.com, heiko.carstens@de.ibm.com, geert@linux-m68k.org, martin.petersen@oracle.com, john.stultz@linaro.org, viresh.kumar@linaro.org, arnd@arndb.de, paulus@samba.org, sboyd@codeaurora.org, mpe@ellerman.id.au, jiangshanlai@gmail.com, harish.patil@cavium.com, linux-kernel@vger.kernel.org, tj@kernel.org, mdr@sgi.com, manish.chopra@cavium.com, mingo@kernel.org, mark.gross@intel.com, cmetcalf@mellanox.com, wim@iguana.be, keescook@chromium.org, benh@kernel.crashing.org, pavel@ucw.cz, hpa@zytor.com, schwidefsky@de.ibm.com, len.brown@intel.com, linux@roeck-us.net Reply-To: linux@roeck-us.net, len.brown@intel.com, schwidefsky@de.ibm.com, hpa@zytor.com, pavel@ucw.cz, benh@kernel.crashing.org, keescook@chromium.org, wim@iguana.be, cmetcalf@mellanox.com, mark.gross@intel.com, tj@kernel.org, mdr@sgi.com, manish.chopra@cavium.com, mingo@kernel.org, harish.patil@cavium.com, linux-kernel@vger.kernel.org, jiangshanlai@gmail.com, mpe@ellerman.id.au, sboyd@codeaurora.org, paulus@samba.org, arnd@arndb.de, viresh.kumar@linaro.org, john.stultz@linaro.org, martin.petersen@oracle.com, geert@linux-m68k.org, heiko.carstens@de.ibm.com, oleg@redhat.com, kvalo@qca.qualcomm.com, ralf@linux-mips.org, rjw@rjwysocki.net, sudipm.mukherjee@gmail.com, akpm@linux-foundation.org, tglx@linutronix.de, stefanr@s5r6.in-berlin.de, gregkh@linuxfoundation.org, jejb@linux.vnet.ibm.com, pmladek@suse.com, sre@kernel.org, ubraun@linux.vnet.ibm.com, jwi@linux.vnet.ibm.com In-Reply-To: <1507159627-127660-12-git-send-email-keescook@chromium.org> References: <1507159627-127660-12-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer: Remove expires argument from __TIMER_INITIALIZER() Git-Commit-ID: 8ede369b2cccfa585e2969bbed18edc0e2a18c50 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8ede369b2cccfa585e2969bbed18edc0e2a18c50 Gitweb: https://git.kernel.org/tip/8ede369b2cccfa585e2969bbed18edc0e2a18c50 Author: Kees Cook AuthorDate: Wed, 4 Oct 2017 16:27:05 -0700 Committer: Thomas Gleixner CommitDate: Thu, 5 Oct 2017 15:01:21 +0200 timer: Remove expires argument from __TIMER_INITIALIZER() The expires field is normally initialized during the first mod_timer() call. It was unused by all callers, so remove it from the macro. Signed-off-by: Kees Cook Cc: linux-mips@linux-mips.org Cc: Petr Mladek Cc: Benjamin Herrenschmidt Cc: Lai Jiangshan Cc: Sebastian Reichel Cc: Kalle Valo Cc: Paul Mackerras Cc: Pavel Machek Cc: linux1394-devel@lists.sourceforge.net Cc: Chris Metcalf Cc: linux-s390@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: "James E.J. Bottomley" Cc: Wim Van Sebroeck Cc: Michael Ellerman Cc: Ursula Braun Cc: Geert Uytterhoeven Cc: Viresh Kumar Cc: Harish Patil Cc: Stephen Boyd Cc: Michael Reed Cc: Manish Chopra Cc: Len Brown Cc: Arnd Bergmann Cc: linux-pm@vger.kernel.org Cc: Heiko Carstens Cc: Tejun Heo Cc: Julian Wiedmann Cc: John Stultz Cc: Mark Gross Cc: linux-watchdog@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: "Martin K. Petersen" Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Oleg Nesterov Cc: Ralf Baechle Cc: Stefan Richter Cc: Guenter Roeck Cc: netdev@vger.kernel.org Cc: Martin Schwidefsky Cc: Andrew Morton Cc: linuxppc-dev@lists.ozlabs.org Cc: Sudip Mukherjee Link: https://lkml.kernel.org/r/1507159627-127660-12-git-send-email-keescook@chromium.org Signed-off-by: Thomas Gleixner --- include/linux/kthread.h | 2 +- include/linux/timer.h | 5 ++--- include/linux/workqueue.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/kthread.h b/include/linux/kthread.h index 82e197e..0d622b3 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -117,7 +117,7 @@ struct kthread_delayed_work { #define KTHREAD_DELAYED_WORK_INIT(dwork, fn) { \ .work = KTHREAD_WORK_INIT((dwork).work, (fn)), \ .timer = __TIMER_INITIALIZER(kthread_delayed_work_timer_fn, \ - 0, (unsigned long)&(dwork), \ + (unsigned long)&(dwork), \ TIMER_IRQSAFE), \ } diff --git a/include/linux/timer.h b/include/linux/timer.h index 91e5a2c..10685c3 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -63,10 +63,9 @@ struct timer_list { #define TIMER_TRACE_FLAGMASK (TIMER_MIGRATING | TIMER_DEFERRABLE | TIMER_PINNED | TIMER_IRQSAFE) -#define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \ +#define __TIMER_INITIALIZER(_function, _data, _flags) { \ .entry = { .next = TIMER_ENTRY_STATIC }, \ .function = (_function), \ - .expires = (_expires), \ .data = (_data), \ .flags = (_flags), \ __TIMER_LOCKDEP_MAP_INITIALIZER( \ @@ -75,7 +74,7 @@ struct timer_list { #define DEFINE_TIMER(_name, _function) \ struct timer_list _name = \ - __TIMER_INITIALIZER(_function, 0, 0, 0) + __TIMER_INITIALIZER(_function, 0, 0) void init_timer_key(struct timer_list *timer, unsigned int flags, const char *name, struct lock_class_key *key); diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 1c49431..f496026 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -176,7 +176,7 @@ struct execute_work { #define __DELAYED_WORK_INITIALIZER(n, f, tflags) { \ .work = __WORK_INITIALIZER((n).work, (f)), \ .timer = __TIMER_INITIALIZER(delayed_work_timer_fn, \ - 0, (unsigned long)&(n), \ + (unsigned long)&(n), \ (tflags) | TIMER_IRQSAFE), \ }