Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv6386/drivers/char
Modified Files:
Makefile tty_io.c
Log Message:
Merge with 2.5.43
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile 20 Mar 2003 00:44:42 -0000 1.25
+++ Makefile 24 Mar 2003 23:47:43 -0000 1.26
@@ -52,6 +52,7 @@
obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
obj-$(CONFIG_PRINTER) += lp.o
+obj-$(CONFIG_TIPAR) += tipar.o
obj-$(CONFIG_BUSMOUSE) += busmouse.o
obj-$(CONFIG_DTLK) += dtlk.o
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tty_io.c 20 Mar 2003 00:44:42 -0000 1.10
+++ tty_io.c 24 Mar 2003 23:47:43 -0000 1.11
@@ -113,7 +113,7 @@
#define CHECK_TTY_COUNT 1
struct termios tty_std_termios; /* for the benefit of tty drivers */
-struct tty_driver *tty_drivers; /* linked list of tty drivers */
+LIST_HEAD(tty_drivers); /* linked list of tty drivers */
struct tty_ldisc ldiscs[NR_LDISCS]; /* line disc dispatch table */
#ifdef CONFIG_UNIX98_PTYS
@@ -338,7 +338,7 @@
minor = minor(device);
major = major(device);
- for (p = tty_drivers; p; p = p->next) {
+ list_for_each_entry(p, &tty_drivers, tty_drivers) {
if (p->major != major)
continue;
if (minor < p->minor_start)
@@ -2083,10 +2083,7 @@
if (!driver->put_char)
driver->put_char = tty_default_put_char;
- driver->prev = 0;
- driver->next = tty_drivers;
- if (tty_drivers) tty_drivers->prev = driver;
- tty_drivers = driver;
+ list_add(&driver->tty_drivers, &tty_drivers);
if ( !(driver->flags & TTY_DRIVER_NO_DEVFS) ) {
for(i = 0; i < driver->num; i++)
@@ -2110,7 +2107,7 @@
if (*driver->refcount)
return -EBUSY;
- for (p = tty_drivers; p; p = p->next) {
+ list_for_each_entry(p, &tty_drivers, tty_drivers) {
if (p == driver)
found++;
else if (p->major == driver->major)
@@ -2127,13 +2124,7 @@
} else
register_chrdev(driver->major, othername, &tty_fops);
- if (driver->prev)
- driver->prev->next = driver->next;
- else
- tty_drivers = driver->next;
-
- if (driver->next)
- driver->next->prev = driver->prev;
+ list_del(&driver->tty_drivers);
/*
* Free the termios and termios_locked structures because
|
