patch-2.4.0-test5 linux/drivers/char/tty_io.c

• Lines: 94
• Date: Fri Jul 21 14:21:06 2000
• Orig file: v2.4.0-test4/linux/drivers/char/tty_io.c
• Orig date: Fri Jul 14 12:12:09 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/tty_io.c linux/drivers/char/tty_io.c
@@ -149,10 +149,9 @@
 extern void hwc_console_init(void);
 extern void con3215_init(void);
 extern void rs285_console_init(void);
-extern void rs285_init(void);
 extern void sa1100_rs_console_init(void);
-extern void sa1100_rs_init(void);
 extern void sgi_serial_console_init(void);
+extern void sci_console_init(void);
 
 #ifndef MIN
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
@@ -988,13 +987,13 @@
 	/* Release locally allocated memory ... nothing placed in slots */
 free_mem_out:
 	if (o_tp)
-		kfree_s(o_tp, sizeof(struct termios));
+		kfree(o_tp);
 	if (o_tty)
 		free_tty_struct(o_tty);
 	if (ltp)
-		kfree_s(ltp, sizeof(struct termios));
+		kfree(ltp);
 	if (tp)
-		kfree_s(tp, sizeof(struct termios));
+		kfree(tp);
 	free_tty_struct(tty);
 
 fail_no_mem:
@@ -1022,7 +1021,7 @@
 		if (o_tty->driver.flags & TTY_DRIVER_RESET_TERMIOS) {
 			tp = o_tty->driver.termios[idx];
 			o_tty->driver.termios[idx] = NULL;
-			kfree_s(tp, sizeof(struct termios));
+			kfree(tp);
 		}
 		o_tty->magic = 0;
 		(*o_tty->driver.refcount)--;
@@ -1033,7 +1032,7 @@
 	if (tty->driver.flags & TTY_DRIVER_RESET_TERMIOS) {
 		tp = tty->driver.termios[idx];
 		tty->driver.termios[idx] = NULL;
-		kfree_s(tp, sizeof(struct termios));
+		kfree(tp);
 	}
 	tty->magic = 0;
 	(*tty->driver.refcount)--;
@@ -2123,12 +2122,12 @@
 		tp = driver->termios[i];
 		if (tp) {
 			driver->termios[i] = NULL;
-			kfree_s(tp, sizeof(struct termios));
+			kfree(tp);
 		}
 		tp = driver->termios_locked[i];
 		if (tp) {
 			driver->termios_locked[i] = NULL;
-			kfree_s(tp, sizeof(struct termios));
+			kfree(tp);
 		}
 		tty_unregister_devfs(driver, driver->minor_start + i);
 	}
@@ -2183,6 +2182,9 @@
 #if defined(CONFIG_SERIAL167)
 	serial167_console_init();
 #endif
+#if defined(CONFIG_SH_SCI)
+	sci_console_init();
+#endif
 #endif
 #ifdef CONFIG_3215
         con3215_init();
@@ -2190,6 +2192,12 @@
 #ifdef CONFIG_HWC
         hwc_console_init();
 #endif
+#ifdef CONFIG_SERIAL_21285_CONSOLE
+	rs285_console_init();
+#endif
+#ifdef CONFIG_SERIAL_SA1100_CONSOLE
+	sa1100_rs_console_init();
+#endif
 }
 
 static struct tty_driver dev_tty_driver, dev_syscons_driver;
@@ -2319,7 +2327,7 @@
 	rio_init();
 #endif
 #if (defined(CONFIG_8xx) || defined(CONFIG_8260))
-        rs_8xx_init();
+	rs_8xx_init();
 #endif /* CONFIG_8xx */
 	pty_init();
 #ifdef CONFIG_MOXA_SMARTIO