Messages in this thread Patch in this message | | | From | James Nelson <> | Subject | [PATCH 6/13] ip2: remove cli()/sti() in drivers/char/ip2main.c | Date | Sun, 16 Jan 2005 07:53:04 -0600 |
| |
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/ip2main.c linux-2.6.11-rc1-mm1/drivers/char/ip2main.c --- linux-2.6.11-rc1-mm1-original/drivers/char/ip2main.c 2005-01-16 07:17:19.000000000 -0500 +++ linux-2.6.11-rc1-mm1/drivers/char/ip2main.c 2005-01-16 07:32:19.311554798 -0500 @@ -2205,9 +2205,9 @@ * for masking). Caller should use TIOCGICOUNT to see which one it was */ case TIOCMIWAIT: - save_flags(flags);cli(); + local_irq_save(flags); cprev = pCh->icount; /* note the counters on entry */ - restore_flags(flags); + local_irq_restore(flags); i2QueueCommands(PTYPE_BYPASS, pCh, 100, 4, CMD_DCD_REP, CMD_CTS_REP, CMD_DSR_REP, CMD_RI_REP); init_waitqueue_entry(&wait, current); @@ -2227,9 +2227,9 @@ rc = -ERESTARTSYS; break; } - save_flags(flags);cli(); + local_irq_save(flags); cnow = pCh->icount; /* atomic copy */ - restore_flags(flags); + local_irq_restore(flags); if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) { rc = -EIO; /* no change => rc */ @@ -2267,9 +2267,9 @@ case TIOCGICOUNT: ip2trace (CHANN, ITRC_IOCTL, 11, 1, rc ); - save_flags(flags);cli(); + local_irq_save(flags); cnow = pCh->icount; - restore_flags(flags); + local_irq_restore(flags); p_cuser = argp; rc = put_user(cnow.cts, &p_cuser->cts); rc = put_user(cnow.dsr, &p_cuser->dsr); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |