Skip to contentSkip to conversation

nozomi: Prepare for BKL pushdown

PATCH New Alan Cox 1 participant 1 message Feb 20, 2008 Char and misc drivers

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 nozomi: Prepare for BKL pushdown

We leave the BKL around the rts/dtr handler because there is *no* locking of any kind on this in the driver. It's not "right" with this change but it's the same wrong as before..

drivers/char/nozomi.c +2 -1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc2-mm1/drivers/char/nozomi.c linux-2.6.25-rc2-mm1/drivers/char/nozomi.c
@@ -1716,6 +1716,7 @@
 static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
 	unsigned int set, unsigned int clear)
 {
+	lock_kernel();		/* FIXME: Add internal locking */
 	if (set & TIOCM_RTS)
 		set_rts(tty, 1);
 	else if (clear & TIOCM_RTS)
@@ -1725,7 +1726,7 @@
 		set_dtr(tty, 1);
 	else if (clear & TIOCM_DTR)
 		set_dtr(tty, 0);
-
+	unlock_kernel();
 	return 0;
 }