diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
| commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
| tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /drivers/tty/metag_da.c | |
| parent | 5130213721d01b6632c255d4295a8102cbb58379 (diff) | |
| parent | f00c0afdfa625165a609513bc74164d56752ec3e (diff) | |
| download | linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz | |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'drivers/tty/metag_da.c')
| -rw-r--r-- | drivers/tty/metag_da.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c index 9325262..25ccef2 100644 --- a/drivers/tty/metag_da.c +++ b/drivers/tty/metag_da.c @@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored) if (channel >= 0) fetch_data(channel); - mod_timer_pinned(&poll_timer, jiffies + DA_TTY_POLL); + mod_timer(&poll_timer, jiffies + DA_TTY_POLL); } static void add_poll_timer(struct timer_list *poll_timer) { - setup_timer(poll_timer, dashtty_timer, 0); + setup_pinned_timer(poll_timer, dashtty_timer, 0); poll_timer->expires = jiffies + DA_TTY_POLL; /* |