From patchwork Wed Oct 4 23:27:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 821534 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y6t3C71bvz9t2Z for ; Thu, 5 Oct 2017 10:51:35 +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="RJDwzFvC"; 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 3y6t3C5tR4zDqny for ; Thu, 5 Oct 2017 10:51:35 +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="RJDwzFvC"; 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:c00::230; helo=mail-pf0-x230.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="RJDwzFvC"; dkim-atps=neutral Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com [IPv6:2607:f8b0:400e:c00::230]) (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 3y6sX80KjjzDr1y for ; Thu, 5 Oct 2017 10:28:08 +1100 (AEDT) Received: by mail-pf0-x230.google.com with SMTP id g62so1438363pfk.12 for ; Wed, 04 Oct 2017 16:28:07 -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=ENoC6ceifCX0aOcJ/MBZnbVT7Ow+d6T0KoRqs154IpM=; b=RJDwzFvC3XzHNc1if9/OmmIMqzdICOA3f7GwHgVf/4e+nXu5ucgQQbhjJ3+5xRM9YN 9r9AsRXA8B031z4hvBG+op089l3TPeHT23FLke4989GJEOcRM5klGEo18bzQRu8ZR1l1 njihfsIgR9W5jX+sg5m2zgB2ooZaB7ruWCT7Q= 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=ENoC6ceifCX0aOcJ/MBZnbVT7Ow+d6T0KoRqs154IpM=; b=tqiuiqzZC1fQuw6m22Lam4Wuo73DkvLD8aJ3t/tmakboHeustQJSMJMcJyURe9yas6 XFCqNgPtMiHmc2gA3oXIoZRqzBsYCplVEAKW2LMv2ASUH4VTsjS2G23cn7+h3RaJlm+u IVqg9Oj7eWdDz/V/8pevoORisDnrU9II1yCWItx+BX0hPQLRSWN5Y5DhbAeYYB74bRFo MD6XmVs328y1IGzUJ/ICoVXtPQii8zZRq1z8q216Urn5GhjrjiAI8og8i4w/LYk83MdG KRI2DsNfMg2ybNZ0iCWBGCaCcLnVlBq5Kxr4mcK7lfel6Jywe1wJflGpEGAsfsX29Dxg xltw== X-Gm-Message-State: AMCzsaUm4QEjJq6LAbkhPl6vTU+K4zbKzLEf58OUerSHZZ2HVUQ9rqy7 ZDEF6BqsC3qfxjb/VKEEaMfe+A== X-Google-Smtp-Source: AOwi7QBw9ZOREqnyQ2O07eO0nOhUfhqDxs0QNbBU/ONe8h2Q5tIoFc6n4flCDb43kQUxTAearc5LOg== X-Received: by 10.84.217.13 with SMTP id o13mr9567439pli.280.1507159686263; Wed, 04 Oct 2017 16:28:06 -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 y63sm16443482pgd.3.2017.10.04.16.27.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 16:28:04 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Subject: [PATCH 11/13] timer: Remove expires argument from __TIMER_INITIALIZER() Date: Wed, 4 Oct 2017 16:27:05 -0700 Message-Id: <1507159627-127660-12-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, "James E.J. Bottomley" , 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 , Mark Gross , 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" 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 Reviewed-by: Petr Mladek --- 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 82e197eeac91..0d622b350d3f 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 91e5a2cc81b5..10685c33e679 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 1c49431f3121..f4960260feaf 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), \ }