patch-1.3.4 linux/drivers/char/n_tty.c

Next file: linux/drivers/char/psaux.c
Previous file: linux/drivers/char/msbusmouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.3/linux/drivers/char/n_tty.c linux/drivers/char/n_tty.c
@@ -803,7 +803,7 @@
 		if (tty->packet && tty->link->ctrl_status) {
 			if (b != buf)
 				break;
-			put_fs_byte(tty->link->ctrl_status, b++);
+			put_user(tty->link->ctrl_status, b++);
 			tty->link->ctrl_status = 0;
 			break;
 		}
@@ -840,7 +840,7 @@
 
 		/* Deal with packet mode. */
 		if (tty->packet && b == buf) {
-			put_fs_byte(TIOCPKT_DATA, b++);
+			put_user(TIOCPKT_DATA, b++);
 			nr--;
 		}
 
@@ -861,7 +861,7 @@
 				tty->read_cnt--;
 				enable_bh(TQUEUE_BH);
 				if (!eol) {
-					put_fs_byte(c, b++);
+					put_user(c, b++);
 					if (--nr)
 						continue;
 					break;
@@ -870,7 +870,7 @@
 					tty->canon_data = 0;
 				}
 				if (c != __DISABLED_CHAR) {
-					put_fs_byte(c, b++);
+					put_user(c, b++);
 					nr--;
 				}
 				break;
@@ -939,7 +939,7 @@
 		}
 		if (O_OPOST(tty)) {
 			while (nr > 0) {
-				c = get_fs_byte(b);
+				c = get_user(b);
 				if (opost(c, tty) < 0)
 					break;
 				b++; nr--;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this