Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv20410/drivers/char
Modified Files:
Makefile tty_io.c
Log Message:
Merge with 2.5.60
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile 3 Aug 2003 12:40:18 -0000 1.34
+++ Makefile 4 Aug 2003 12:18:14 -0000 1.35
@@ -9,13 +9,6 @@
obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o
-# All of the (potential) objects that export symbols.
-# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-
-export-objs := busmouse.o vt.o generic_serial.o ip2main.o consolemap.o\
- ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
- selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
-
obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
@@ -86,6 +79,7 @@
obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_IPMI_HANDLER) += ipmi/
+obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tty_io.c 3 Aug 2003 18:28:35 -0000 1.17
+++ tty_io.c 4 Aug 2003 12:18:14 -0000 1.18
@@ -442,6 +442,13 @@
file_list_lock();
for (l = tty->tty_files.next; l != &tty->tty_files; l = l->next) {
struct file * filp = list_entry(l, struct file, f_list);
+ /*
+ * If this file descriptor has been closed, ignore it; it
+ * will be going away shortly. (We don't test filp->f_count
+ * for zero since that could open another race.) --rmk
+ */
+ if (filp->private_data == NULL)
+ continue;
if (IS_CONSOLE_DEV(filp->f_dentry->d_inode->i_rdev) ||
IS_SYSCONS_DEV(filp->f_dentry->d_inode->i_rdev)) {
cons_filp = filp;
|
