The patch titled serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix has been added to the -mm tree. Its filename is serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> drivers/serial/timbuart.c: In function 'timbuart_flush_buffer': drivers/serial/timbuart.c:72: error: implicit declaration of function 'timbuart_tx_empty' drivers/serial/timbuart.c: At top level: drivers/serial/timbuart.c:201: error: conflicting types for 'timbuart_tx_empty' drivers/serial/timbuart.c:72: error: previous implicit declaration of 'timbuart_tx_empty' was here confused. Cc: Greg KH <greg@xxxxxxxxx> Cc: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/timbuart.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/serial/timbuart.c~serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix drivers/serial/timbuart.c --- a/drivers/serial/timbuart.c~serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix +++ a/drivers/serial/timbuart.c @@ -67,6 +67,13 @@ static void timbuart_start_tx(struct uar tasklet_schedule(&uart->tasklet); } +static unsigned int timbuart_tx_empty(struct uart_port *port) +{ + u32 isr = ioread32(port->membase + TIMBUART_ISR); + + return (isr & TXBE) ? TIOCSER_TEMT : 0; +} + static void timbuart_flush_buffer(struct uart_port *port) { if (!timbuart_tx_empty(port)) { @@ -197,13 +204,6 @@ void timbuart_tasklet(unsigned long arg) dev_dbg(uart->port.dev, "%s leaving\n", __func__); } -static unsigned int timbuart_tx_empty(struct uart_port *port) -{ - u32 isr = ioread32(port->membase + TIMBUART_ISR); - - return (isr & TXBE) ? TIOCSER_TEMT : 0; -} - static unsigned int timbuart_get_mctrl(struct uart_port *port) { u8 cts = ioread8(port->membase + TIMBUART_CTRL); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are c2port-fix-device_create-return-value-check.patch linux-next.patch next-remove-localversion.patch i-need-old-gcc.patch arch-x86-crypto-aesni-intel_asms-still-busted.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-i2c-busses-i2c-xiicc-is-borked.patch ratelimit-annotate-___ratelimit-fix.patch drivers-acpi-use-kasprintf-fix.patch arch-arm-include-asm-elfh-forward-declare-the-task-struct.patch cpufreq-ondemand-dont-synchronize-sample-rate-unless-mulitple-cpus-present.patch fs-fscache-object-listc-fix-warning-on-32-bit.patch hpet-factor-timer-allocate-from-open-fix.patch of-gpio-implement-gpiolib-notifier-hooks-fix.patch of-gpio-implement-gpiolib-notifier-hooks-fix-fix2.patch led-driver-for-the-soekris-net5501-board-checkpatch-fixes.patch bitops-rename-for_each_bit-to-for_each_set_bit-mtd.patch 3x59x-fix-pci-resource-management.patch serial-add-driver-for-the-altera-uart-unbork.patch serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix.patch iio-iio_get_new_idr_val-return-negative-value-on-failure-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch firmware-loader-use-statically-initialized-data-attribute-fix.patch firmware-loader-use-statically-initialized-data-attribute-fix-fix.patch davinci-mmc-updates-to-suspend-resume-implementation-checkpatch-fixes.patch checkpatch-add-check-for-too-short-kconfig-descriptions-checkpatch-fixes.patch hwmon-driver-for-ti-tmp102-temperature-sensor.patch memcg-oom-kill-disable-and-oom-status-update-checkpatch-fixes.patch fault-injection-add-cpu-notifier-error-injection-module-fix.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch panic-allow-taint-flag-for-warnings-to-be-changed-from-taint_warn-checkpatch-fixes.patch bitops-remove-temporary-for_each_bit.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch notify_change-callers-must-hold-i_mutex.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