rpms/kernel/F-11 linux-2.6-serial-add-txen-test-param.patch, 1.2, 1.3 kernel.spec, 1.1692, 1.1693

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30901

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-serial-add-txen-test-param.patch 
Log Message:
linux-2.6-serial-add-txen-test-param.patch

linux-2.6-serial-add-txen-test-param.patch:
 8250.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: linux-2.6-serial-add-txen-test-param.patch
===================================================================
RCS file: linux-2.6-serial-add-txen-test-param.patch
diff -N linux-2.6-serial-add-txen-test-param.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-serial-add-txen-test-param.patch	10 Aug 2009 19:35:43 -0000	1.3
@@ -0,0 +1,32 @@
+diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
+index a0127e9..19ba194 100644
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
+@@ -64,6 +64,8 @@ static int serial_index(struct uart_port *port)
+ 	return (serial8250_reg.minor - 64) + port->line;
+ }
+ 
++static unsigned int skip_txen_test; /* force skip of txen test at init time */
++
+ /*
+  * Debugging.
+  */
+@@ -2101,7 +2103,7 @@ static int serial8250_startup(struct uart_port *port)
+ 	   is variable. So, let's just don't test if we receive
+ 	   TX irq. This way, we'll never enable UART_BUG_TXEN.
+ 	 */
+-	if (up->port.flags & UPF_NO_TXEN_TEST)
++	if (skip_txen_test || up->port.flags & UPF_NO_TXEN_TEST)
+ 		goto dont_test_tx_en;
+ 
+ 	/*
+@@ -3235,6 +3237,9 @@ MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
+ module_param(nr_uarts, uint, 0644);
+ MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
+ 
++module_param(skip_txen_test, uint, 0644);
++MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
++
+ #ifdef CONFIG_SERIAL_8250_RSA
+ module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
+ MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -p -r1.1692 -r1.1693
--- kernel.spec	10 Aug 2009 19:32:51 -0000	1.1692
+++ kernel.spec	10 Aug 2009 19:35:43 -0000	1.1693
@@ -622,6 +622,7 @@ Patch451: linux-2.6-input-fix-toshiba-ho
 
 Patch460: linux-2.6-serial-460800.patch
 Patch461: linux-2.6-drivers-char-low-latency-removal.patch
+Patch462: linux-2.6-serial-add-txen-test-param.patch
 
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1211,9 +1212,10 @@ ApplyPatch linux-2.6-input-fix-toshiba-h
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
-
 # fix oops in nozomi drver (#507005) plus two others
 ApplyPatch linux-2.6-drivers-char-low-latency-removal.patch
+# let users skip the TXEN bug test
+ApplyPatch linux-2.6-serial-add-txen-test-param.patch
 
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
@@ -1866,6 +1868,7 @@ fi
  - linux-2.6.29-xen-disable-gbpages.patch
  - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
  - linux-2.6-drivers-char-low-latency-removal.patch
+ - linux-2.6-serial-add-txen-test-param.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.