The patch titled cyclades: Prepare for relaxed locking in callers has been removed from the -mm tree. Its filename was cyclades-prepare-for-relaxed-locking-in-callers.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cyclades: Prepare for relaxed locking in callers From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Basically wrap it in lock_kernel where it is hard to prove the locking is ok. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: "John Stoffel" <john@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/cyclades.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff -puN drivers/char/cyclades.c~cyclades-prepare-for-relaxed-locking-in-callers drivers/char/cyclades.c --- a/drivers/char/cyclades.c~cyclades-prepare-for-relaxed-locking-in-callers +++ a/drivers/char/cyclades.c @@ -3464,6 +3464,8 @@ static int cy_tiocmget(struct tty_struct if (serial_paranoia_check(info, tty->name, __FUNCTION__)) return -ENODEV; + lock_kernel(); + card = info->card; channel = info->line - card->first_line; if (!IS_CYC_Z(*card)) { @@ -3506,10 +3508,12 @@ static int cy_tiocmget(struct tty_struct ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0); } else { result = 0; + unlock_kernel(); return -ENODEV; } } + unlock_kernel(); return result; } /* cy_tiomget */ @@ -3880,6 +3884,7 @@ cy_ioctl(struct tty_struct *tty, struct printk(KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n", info->line, cmd, arg); #endif + lock_kernel(); switch (cmd) { case CYGETMON: @@ -3988,47 +3993,47 @@ cy_ioctl(struct tty_struct *tty, struct p_cuser = argp; ret_val = put_user(cnow.cts, &p_cuser->cts); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.dsr, &p_cuser->dsr); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.rng, &p_cuser->rng); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.dcd, &p_cuser->dcd); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.rx, &p_cuser->rx); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.tx, &p_cuser->tx); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.frame, &p_cuser->frame); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.overrun, &p_cuser->overrun); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.parity, &p_cuser->parity); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.brk, &p_cuser->brk); if (ret_val) - return ret_val; + break; ret_val = put_user(cnow.buf_overrun, &p_cuser->buf_overrun); if (ret_val) - return ret_val; + break; ret_val = 0; break; default: ret_val = -ENOIOCTLCMD; } + unlock_kernel(); #ifdef CY_DEBUG_OTHER printk(KERN_DEBUG "cyc:cy_ioctl done\n"); #endif - return ret_val; } /* cy_ioctl */ _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are origin.patch add-time_is_after_jiffies-and-others-which-compare-with-jiffies.patch pata_atiixp-simplex-clear.patch pata_atiixp-dont-disable.patch 8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core.patch parisc-new-termios-definitions.patch generic-irq-let-setup_irq-reenable-a-shared-irq.patch 8250-switch-8250-drivers-to-use-_nocache-ioremaps.patch sxc-fix-printk-warnings-on-sparc32.patch put_pid-make-sure-we-dont-free-the-live-pid.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