patch-2.1.6 linux/drivers/char/tty_io.c

• Lines: 33
• Date: Tue Oct 29 15:33:38 1996
• Orig file: v2.1.5/linux/drivers/char/tty_io.c
• Orig date: Wed Oct 16 10:48:15 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/char/tty_io.c linux/drivers/char/tty_io.c
@@ -63,12 +63,10 @@
 #include <linux/string.h>
 #include <linux/malloc.h>
 
-#include <asm/segment.h>
+#include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/bitops.h>
 
-#include <linux/scc.h>
-
 #include "kbd_kern.h"
 #include "vt_kern.h"
 #include "selection.h"
@@ -1714,7 +1712,7 @@
 		if (((*p)->tty == tty) ||
 		    ((session > 0) && ((*p)->session == session)))
 			send_sig(SIGKILL, *p, 1);
-		else {
+		else if ((*p)->files) {
 			for (i=0; i < NR_OPEN; i++) {
 				filp = (*p)->files->fd[i];
 				if (filp && (filp->f_op == &tty_fops) &&
@@ -1927,9 +1925,6 @@
 	kbd_init();
 #ifdef CONFIG_SERIAL
 	rs_init();
-#endif
-#ifdef CONFIG_SCC
-	scc_init();
 #endif
 #ifdef CONFIG_CYCLADES
 	cy_init();