The patch titled
cpm_uart: use schedule_timeout instead of direct call to schedule
has been added to the -mm tree. Its filename is
cpm_uart-use-schedule_timeout-instead-of-direct-call-to.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
ppc32-remove-board-support-for-adir.patch
ppc32-remove-board-support-for-ash.patch
ppc32-remove-board-support-for-beech.patch
ppc32-remove-defconfig-for-cedar.patch
ppc32-remove-board-support-for-k2.patch
ppc32-remove-board-support-for-mcpn765.patch
ppc32-remove-board-support-for-menf1.patch
ppc32-remove-board-support-for-oak.patch
ppc32-remove-board-support-for-rainier.patch
ppc32-remove-board-support-for-redwood.patch
ppc32-remove-board-support-for-sm850.patch
ppc32-remove-board-support-for-spd823ts.patch
ppc32-remove-board-support-for-pcore.patch
ppc32-added-support-for-the-book-e-style-watchdog-timer.patch
ppc32-add-ppc_sys-descriptions-for-powerquicc-ii-devices.patch
cpm_uart-fix-2nd-serial-port-on-mpc8560-ads.patch
cpm_uart-use-schedule_timeout-instead-of-direct-call-to.patch
cpm_uart-fix-baseaddress-for-smc-1-and-2.patch
ppc32-cleaned-up-global-namespace-of-book-e-watchdog.patch
ppc32-removed-find_namec.patch
ppc32-ppc_sys-system-on-chip-identification-additions.patch
ppc32-add-config_hz.patch
From: Kumar Gala <[EMAIL PROTECTED]>
use schedule_timeout instead of direct call to schedule
Signed-off-by: Marcelo Tosatti <[EMAIL PROTECTED]>
Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/serial/cpm_uart/cpm_uart_core.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff -puN
drivers/serial/cpm_uart/cpm_uart_core.c~cpm_uart-use-schedule_timeout-instead-of-direct-call-to
drivers/serial/cpm_uart/cpm_uart_core.c
---
devel/drivers/serial/cpm_uart/cpm_uart_core.c~cpm_uart-use-schedule_timeout-instead-of-direct-call-to
2005-08-30 00:15:01.000000000 -0700
+++ devel-akpm/drivers/serial/cpm_uart/cpm_uart_core.c 2005-08-30
00:15:01.000000000 -0700
@@ -403,10 +403,8 @@ static int cpm_uart_startup(struct uart_
inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)
{
- unsigned long target_jiffies = jiffies + pinfo->wait_closing;
-
- while (!time_after(jiffies, target_jiffies))
- schedule();
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(pinfo->wait_closing);
}
/*
@@ -425,9 +423,12 @@ static void cpm_uart_shutdown(struct uar
/* If the port is not the console, disable Rx and Tx. */
if (!(pinfo->flags & FLAG_CONSOLE)) {
/* Wait for all the BDs marked sent */
- while(!cpm_uart_tx_empty(port))
+ while(!cpm_uart_tx_empty(port)) {
+ set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(2);
- if(pinfo->wait_closing)
+ }
+
+ if (pinfo->wait_closing)
cpm_uart_wait_until_send(pinfo);
/* Stop uarts */
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
