r1798 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: 2004-11-05 18:13:05 -0700 (Fri, 05 Nov 2004)
New Revision: 1798

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-serial-sn_console-up-buildfix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-2
Log:
UP build fix for sn_console driver


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-11-05 23:25:43 UTC (rev 1797)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-11-06 01:13:05 UTC (rev 1798)
@@ -7,8 +7,10 @@
   * [ia64] fix a bug that causes HP systems to run out of DMA mapping resources
     under heavy load (dann frazier)
 
- -- dann frazier <dannf@debian.org>  Fri, 05 Nov 2004 15:05:53 -0700
+  * Include a UP build fix for the sn_console driver (dann frazier)
 
+ -- dann frazier <dannf@debian.org>  Fri, 05 Nov 2004 18:11:56 -0700
+
 kernel-source-2.6.9 (2.6.9-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-serial-sn_console-up-buildfix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-serial-sn_console-up-buildfix.dpatch	2004-11-05 23:25:43 UTC (rev 1797)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-serial-sn_console-up-buildfix.dpatch	2004-11-06 01:13:05 UTC (rev 1798)
@@ -0,0 +1,49 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Build fix for sn_console driver
+## DP: Patch author: Jesse Barnes <jbarnes@sgi.com>
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/24 11:31:37-07:00 jbarnes@engr.sgi.com 
+#   [PATCH] fix sn_console for CONFIG_SMP=n
+#   
+#   I found that sn_console was missing an include and a fix if CONFIG_SMP=n.  
+#   This patch fixes up the two small problems I found.
+#   
+#   Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
+#   Signed-off-by: Andrew Morton <akpm@osdl.org>
+#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+# 
+# drivers/serial/sn_console.c
+#   2004/08/24 02:08:49-07:00 jbarnes@engr.sgi.com +3 -0
+#   fix sn_console for CONFIG_SMP=n
+# 
+diff -Nru a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
+--- a/drivers/serial/sn_console.c	2004-11-05 17:05:12 -08:00
++++ b/drivers/serial/sn_console.c	2004-11-05 17:05:12 -08:00
+@@ -50,6 +50,7 @@
+ #include <linux/miscdevice.h>
+ #include <linux/serial_core.h>
+ 
++#include <asm/io.h>
+ #include <asm/sn/simulator.h>
+ #include <asm/sn/sn2/sn_private.h>
+ #include <asm/sn/sn_sal.h>
+@@ -1086,7 +1087,9 @@
+ 			spin_unlock_irqrestore(&port->sc_port.lock, flags);
+ 
+ 			puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+ 		}
++#endif
+ 	}
+ 	else {
+ 		/* Not yet registered with serial core - simple case */

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-2
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-2	2004-11-05 23:25:43 UTC (rev 1797)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-2	2004-11-06 01:13:05 UTC (rev 1798)
@@ -1,3 +1,4 @@
 + drivers-pci-quirks-via8233a.dpatch
 + parport_pc-via8231.dpatch
 + ia64-hp-sba_iommu-fix.dpatch
++ drivers-serial-sn_console-up-buildfix.dpatch