[Linuxconsole-commit]CVS: ruby/ruby-2.6/drivers/char Kconfig,1.2,1.3 Makefile,1.3,1.4 keyboard.c,1.8,1.9 tty_io.c,1.4,1.5

[Aivils S. <ai...@us...>]

Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv18787/ruby-2.6/drivers/char

Modified Files:
	Kconfig Makefile keyboard.c tty_io.c 
Log Message:
sync to 2.6.0-test9

Index: Kconfig
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	2 Oct 2003 09:32:18 -0000	1.2
+++ Kconfig	28 Oct 2003 07:17:36 -0000	1.3
@@ -380,6 +380,22 @@
 	  If you have an Alchemy AU1000 processor (MIPS based) and you want
 	  to use serial ports, say Y.  Otherwise, say N.
 
+config SGI_L1_SERIAL
+	bool "SGI Altix L1 serial support"
+	depends on SERIAL_NONSTANDARD && IA64
+	help
+	  If you have an SGI Altix and you want to use the serial port
+	  connected to the system controller (you want this!), say Y.
+	  Otherwise, say N.
+
+config SGI_L1_SERIAL_CONSOLE
+	bool "SGI Altix L1 serial console support"
+	depends on SGI_L1_SERIAL
+	help
+	  If you have an SGI Altix and you would like to use the system
+	  controller serial port as your console (you want this!),
+	  say Y.  Otherwise, say N.
+
 config AU1000_SERIAL_CONSOLE
 	bool "Enable Au1000 serial console"
 	depends on AU1000_UART
@@ -858,7 +874,7 @@
 
 config SONYPI
 	tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && X86 && PCI
+	depends on EXPERIMENTAL && X86 && PCI && !64BIT
 	---help---
 	  This driver enables access to the Sony Programmable I/O Control
 	  Device which can be found in many (all ?) Sony Vaio laptops.
@@ -960,6 +976,15 @@
 	  The raw driver permits block devices to be bound to /dev/raw/rawN. 
 	  Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
 	  See the raw(8) manpage for more details.
+
+config MAX_RAW_DEVS
+	int "Maximum number of RAW devices to support (1-8192)"
+	depends on RAW_DRIVER
+	default "256"
+	help
+	  The maximum number of RAW devices that are supported.
+	  Default is 256. Increase this number in case you need lots of
+	  raw devices.
 
 config HANGCHECK_TIMER
 	tristate "Hangcheck timer"

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	2 Oct 2003 09:32:18 -0000	1.3
+++ Makefile	28 Oct 2003 07:17:36 -0000	1.4
@@ -42,6 +42,7 @@
 obj-$(CONFIG_SH_SCI)		+= sh-sci.o generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)	+= hvc_console.o
 obj-$(CONFIG_RAW_DRIVER)	+= raw.o
+obj-$(CONFIG_SGI_L1_SERIAL)    += sn_serial.o
 
 obj-$(CONFIG_PRINTER) += lp.o
 obj-$(CONFIG_TIPAR) += tipar.o

Index: keyboard.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/keyboard.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- keyboard.c	28 Oct 2003 07:14:53 -0000	1.8
+++ keyboard.c	28 Oct 2003 07:17:36 -0000	1.9
@@ -153,12 +153,13 @@
 	oldkey = INPUT_KEYCODE(dev, scancode);
 	INPUT_KEYCODE(dev, scancode) = keycode;
 
-	for (i = 0; i < dev->keycodemax; i++)
-		if (keycode == oldkey)
-			break;
-	if (i == dev->keycodemax)
-		clear_bit(oldkey, dev->keybit);
-	set_bit(keycode, dev->keybit);
+        clear_bit(oldkey, dev->keybit);
+        set_bit(keycode, dev->keybit);
+
+        for (i = 0; i < dev->keycodemax; i++)
+                if (INPUT_KEYCODE(dev,i) == oldkey)
+                        set_bit(oldkey, dev->keybit);
+
 	return 0;
 }
 

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/tty_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tty_io.c	14 Oct 2003 08:32:10 -0000	1.4
+++ tty_io.c	28 Oct 2003 07:17:36 -0000	1.5
@@ -114,6 +114,8 @@
 	.c_cc = INIT_C_CC
 };
 
+EXPORT_SYMBOL(tty_std_termios);
+
 LIST_HEAD(tty_drivers);			/* linked list of tty drivers */
 struct tty_ldisc ldiscs[NR_LDISCS];	/* line disc dispatch table	*/
 
@@ -418,8 +420,6 @@
 		redirect = NULL;
 	}
 	spin_unlock(&redirect_lock);
-	if (f)
-		fput(f);
 	
 	check_tty_count(tty, "do_tty_hangup");
 	file_list_lock();
@@ -507,6 +507,8 @@
 	} else if (tty->driver->hangup)
 		(tty->driver->hangup)(tty);
 	unlock_kernel();
+	if (f)
+		fput(f);
 }
 
 void tty_hangup(struct tty_struct * tty)
@@ -2040,6 +2042,8 @@
 		schedule_delayed_work(&tty->flip.work, 1);
 }
 
+EXPORT_SYMBOL(tty_flip_buffer_push);
+
 /*
  * This subroutine initializes a tty structure.
  */
@@ -2319,6 +2323,8 @@
 	return 0;
 }
 
+EXPORT_SYMBOL(tty_register_driver);
+
 /*
  * Called by a tty driver to unregister itself.
  */
@@ -2365,6 +2371,7 @@
 	return 0;
 }
 
+EXPORT_SYMBOL(tty_unregister_driver);
 
 /*
  * Initialize the console device. This is called *early*, so