From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964791AbcGGInS (ORCPT ); Thu, 7 Jul 2016 04:43:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756875AbcGGInP (ORCPT ); Thu, 7 Jul 2016 04:43:15 -0400 Date: Thu, 7 Jul 2016 01:42:35 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, fweisbec@gmail.com, riel@redhat.com, arjan@infradead.org, linux@sciencehorizons.net, edumazet@google.com, lenb@kernel.org, hpa@zytor.com, tglx@linutronix.de, clm@fb.com, paulmck@linux.vnet.ibm.com, mingo@kernel.org, josh@joshtriplett.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Reply-To: hpa@zytor.com, lenb@kernel.org, tglx@linutronix.de, peterz@infradead.org, linux@sciencehorizons.net, edumazet@google.com, arjan@infradead.org, fweisbec@gmail.com, riel@redhat.com, mingo@kernel.org, josh@joshtriplett.org, paulmck@linux.vnet.ibm.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, clm@fb.com In-Reply-To: <20160704094341.537448301@linutronix.de> References: <20160704094341.537448301@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers, drivers/tty/mips_ejtag: Initialize the poll timer as pinned Git-Commit-ID: 853f90d49bbabcf4e01c615402c1bea1871d7646 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: 853f90d49bbabcf4e01c615402c1bea1871d7646 Gitweb: http://git.kernel.org/tip/853f90d49bbabcf4e01c615402c1bea1871d7646 Author: Thomas Gleixner AuthorDate: Mon, 4 Jul 2016 09:50:22 +0000 Committer: Ingo Molnar CommitDate: Thu, 7 Jul 2016 10:34:59 +0200 timers, drivers/tty/mips_ejtag: Initialize the poll timer as pinned Pinned timers must carry the pinned attribute in the timer structure itself, so convert the code to the new API. No functional change. Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Cc: Arjan van de Ven Cc: Chris Mason Cc: Eric Dumazet Cc: George Spelvin Cc: Josh Triplett Cc: Len Brown Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094341.537448301@linutronix.de Signed-off-by: Ingo Molnar --- drivers/tty/mips_ejtag_fdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/mips_ejtag_fdc.c b/drivers/tty/mips_ejtag_fdc.c index a119176..234123b 100644 --- a/drivers/tty/mips_ejtag_fdc.c +++ b/drivers/tty/mips_ejtag_fdc.c @@ -689,7 +689,7 @@ static void mips_ejtag_fdc_tty_timer(unsigned long opaque) mips_ejtag_fdc_handle(priv); if (!priv->removing) - mod_timer_pinned(&priv->poll_timer, jiffies + FDC_TTY_POLL); + mod_timer(&priv->poll_timer, jiffies + FDC_TTY_POLL); } /* TTY Port operations */ @@ -1002,7 +1002,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev) raw_spin_unlock_irq(&priv->lock); } else { /* If we didn't get an usable IRQ, poll instead */ - setup_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer, + setup_pinned_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer, (unsigned long)priv); priv->poll_timer.expires = jiffies + FDC_TTY_POLL; /*