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

[Dann Frazier]

Author: dannf
Date: 2004-11-08 16:46:12 -0700 (Mon, 08 Nov 2004)
New Revision: 1812

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ia64-sn-move-irq-noop.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:
fix UP build on ia64


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-08 09:42:51 UTC (rev 1811)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-11-08 23:46:12 UTC (rev 1812)
@@ -23,8 +23,11 @@
   * Fixes to cope with hadrware with broken GetMaxLUN responses (Simon Horman).
     (Possible fix for: Bug#279889)
 
- -- Simon Horman <horms@debian.org>  Mon,  8 Nov 2004 13:03:44 +0900
+  * [ia64] Fix UP build by making sn_move_irq() a no-op when CONFIG_SMP=n
+    (dann frazier)
 
+ -- dann frazier <dannf@debian.org>  Mon, 08 Nov 2004 16:45:32 -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/ia64-sn-move-irq-noop.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ia64-sn-move-irq-noop.dpatch	2004-11-08 09:42:51 UTC (rev 1811)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/ia64-sn-move-irq-noop.dpatch	2004-11-08 23:46:12 UTC (rev 1812)
@@ -0,0 +1,29 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Make sn_move_irq() a no-op on UP systems - fixes build
+## DP: Patch author: dann frazier <dannf@hp.com>
+## DP: Upstream status: code has been rewritten since - band-aid for 2.6.9
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- build-itanium/arch/ia64/sn/kernel/irq.c~	2004-10-18 15:53:22.000000000 -0600
++++ build-itanium/arch/ia64/sn/kernel/irq.c	2004-11-05 18:29:41.242076444 -0700
+@@ -74,6 +74,7 @@
+ 
+ static inline void sn_move_irq(int irq)
+ {
++#ifdef CONFIG_SMP
+ 	/* note - we hold desc->lock */
+ 	cpumask_t tmp;
+ 	irq_desc_t *desc = irq_descp(irq);
+@@ -85,6 +86,7 @@
+ 		}
+ 		cpus_clear(pending_irq_cpumask[irq]);
+ 	}
++#endif
+ }
+ 
+ static void

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-08 09:42:51 UTC (rev 1811)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-2	2004-11-08 23:46:12 UTC (rev 1812)
@@ -8,3 +8,4 @@
 + mm-vmscan.dpatch
 + drivers-usb-storage-transport-1.dpatch
 + drivers-usb-storage-transport-1.dpatch
++ ia64-hp-sba_iommu-fix.dpatch