r1167 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Dann Frazier]

Author: dannf
Date: 2004-08-17 00:26:55 -0600 (Tue, 17 Aug 2004)
New Revision: 1167

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-sn_console-for-config_smp.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ia64_cyclone_nosmp.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-2
Log:
add a couple UP build fixes for ia64


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-17 04:54:29 UTC (rev 1166)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-17 06:26:55 UTC (rev 1167)
@@ -4,6 +4,7 @@
   * Added g4 l2 flush and MSR patch from Jacob Pan (Sven Luther).
   * Added marvell gigabit ethernet driver errata patch from Nicolas Det
     (Sven Luther).
+  * Added UP build fixes for sn_console & cyclone on ia64 (dann frazier).
 
  -- Sven Luther <luther@debian.org>  Mon, 16 Aug 2004 17:46:29 +0200
 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-2
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-2	2004-08-17 04:54:29 UTC (rev 1166)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-2	2004-08-17 06:26:55 UTC (rev 1167)
@@ -29,3 +29,5 @@
 xfs-ioctl32
 drivers-scsi-sym53c8xx_revert
 ia64-generic-no-smp-1-to-2
+ia64_cyclone_nosmp
+fix-sn_console-for-config_smp

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-sn_console-for-config_smp.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-sn_console-for-config_smp.dpatch	2004-08-17 04:54:29 UTC (rev 1166)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-sn_console-for-config_smp.dpatch	2004-08-17 06:26:55 UTC (rev 1167)
@@ -0,0 +1,46 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix sn_console compilation for UP
+## DP: Patch author: Jesse Barnes <jbarnes@sgi.com>
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+
+From: Jesse Barnes <jbarnes@engr.sgi.com>
+
+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>
+---
+
+ 25-akpm/drivers/serial/sn_console.c |    3 +++
+ 1 files changed, 3 insertions(+)
+
+diff -puN drivers/serial/sn_console.c~fix-sn_console-for-config_smp=n drivers/serial/sn_console.c
+--- 25/drivers/serial/sn_console.c~fix-sn_console-for-config_smp=n	2004-08-15 15:40:38.161876312 -0700
++++ 25-akpm/drivers/serial/sn_console.c	2004-08-15 15:40:38.165875704 -0700
+@@ -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 @@ sn_sal_console_write(struct console *co,
+ 			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 */
+_

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ia64_cyclone_nosmp.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ia64_cyclone_nosmp.dpatch	2004-08-17 04:54:29 UTC (rev 1166)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ia64_cyclone_nosmp.dpatch	2004-08-17 06:26:55 UTC (rev 1167)
@@ -0,0 +1,34 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix cyclone build on IA64 for UP
+## DP: Patch author: Jesse Barnes <jbarnes@sgi.com>
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+
+fix ia64 cyclone build errors
+
+Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
+
+diffstat:=
+ arch/ia64/kernel/cyclone.c |    3 +++
+ 1 files changed, 3 insertions(+)
+
+diff -Naurp ./arch/ia64/kernel/cyclone.c~ia64_no_smp ./arch/ia64/kernel/cyclone.c
+--- ./arch/ia64/kernel/cyclone.c~ia64_no_smp	Mon Aug 16 14:13:52 2004
++++ ./arch/ia64/kernel/cyclone.c	Mon Aug 16 14:06:26 2004
+@@ -1,7 +1,10 @@
++#include <linux/init.h>
+ #include <linux/smp.h>
+ #include <linux/time.h>
+ #include <linux/errno.h>
+ 
++#include <asm/io.h>
++
+ /* IBM Summit (EXA) Cyclone counter code*/
+ #define CYCLONE_CBAR_ADDR 0xFEB00CD0
+ #define CYCLONE_PMCC_OFFSET 0x51A0