The patch titled Char: moxa, fix and optimise empty timer has been removed from the -mm tree. Its filename was char-moxa-fix-and-optimise-empty-timer.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Char: moxa, fix and optimise empty timer From: Jiri Slaby <jirislaby@xxxxxxxxx> moxa, fix and optimise empty timer don't wait and delete empty timer in empty timer function. Also fire next empty timer at rounded jiffies to save power. Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/moxa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/char/moxa.c~char-moxa-fix-and-optimise-empty-timer drivers/char/moxa.c --- a/drivers/char/moxa.c~char-moxa-fix-and-optimise-empty-timer +++ a/drivers/char/moxa.c @@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned lo struct moxa_port *ch; ch = (struct moxa_port *) data; - del_timer_sync(&moxa_ports[ch->port].emptyTimer); if (ch->tty && (ch->statusflags & EMPTYWAIT)) { if (MoxaPortTxQueue(ch->port) == 0) { ch->statusflags &= ~EMPTYWAIT; tty_wakeup(ch->tty); return; } - mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ); + mod_timer(&moxa_ports[ch->port].emptyTimer, + round_jiffies(jiffies + HZ)); } else ch->statusflags &= ~EMPTYWAIT; } _ Patches currently in -mm which might be from jirislaby@xxxxxxxxx are origin.patch git-dvb.patch v4l-stk11xx-add-a-new-webcam-driver.patch v4l-stk11xx-use-array_size-in-another-2-cases.patch v4l-stk11xx-use-retval-from-stk11xx_check_device.patch v4l-stk11xx-add-static-to-tables.patch git-wireless.patch misc-phantom-synchronize_irq-on-suspend.patch misc-phantom-add-comment-about-openhaptics.patch misc-phantom-improved-data-passing.patch fs-select-remove-unused-macros.patch remove-asm-bitopsh-includes.patch forbid-asm-bitopsh-direct-inclusion.patch cyber2000fb-rename-bit-macro.patch i2c-pxa-rename-bit-macro-to-pxa_bit.patch s2io-rename-bit-macro.patch amba-pl011-rename-bit-macro.patch define-first-set-of-bit-macros.patch get-rid-of-input-bit-duplicate-defines.patch define-global-bit-macro.patch flashpoint-use-bit-instead-of-bitw.patch remove-bits_to_type-macro.patch remove-bits_to_type-macro-fix.patch remove-asm-bitopsh-includes-reiser4.patch shrink_slab-handle-bad-shrinkers.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html