r2206 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: 2005-01-08 22:14:22 +0100 (Sat, 08 Jan 2005)
New Revision: 2206

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-bte_error-missing-include.dpatch
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-irq-affinity-upfix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3
Log:
fix ia64 UP builds

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-08 19:26:33 UTC (rev 2205)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-08 21:14:22 UTC (rev 2206)
@@ -13,8 +13,12 @@
     Linus' patch instead; 032-do_brk_security_fixes.dpatch
     (Andres Salomon).
 
- -- Simon Horman <horms@debian.org>  Sat,  8 Jan 2005 11:58:20 +0900
+  * Add a couple fixes for ia64 UP builds (dann frazier):
+      ia64-irq-affinity-upfix.dpatch
+      ia64-bte_error-missing-include.dpatch
 
+ -- dann frazier <dannf@debian.org>  Sat, 08 Jan 2005 12:52:15 -0700
+
 kernel-source-2.6.10 (2.6.10-2) unstable; urgency=low
 
   * [SECURITY] 028-do_brk_security_fixes.dpatch

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-bte_error-missing-include.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-bte_error-missing-include.dpatch	2005-01-08 19:26:33 UTC (rev 2205)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-bte_error-missing-include.dpatch	2005-01-08 21:14:22 UTC (rev 2206)
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+## DP: Description: Add include for missing HZ define - fixes UP builds
+## DP: Patch author: dann frazier <dannf@hp.com>
+## DP: Upstream status: Submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+A UP build of 2.6.10 fails in bte_error.c because HZ is undefined.
+Approved by Jesse in Message-Id: <200501061330.48941.jbarnes@engr.sgi.com>
+
+Signed-off-by: dann frazier <dannf@hp.com>
+Signed-off-by: Jesse Barnes <jbarnes@engr.sgi.com>
+
+--- kernel-source-2.6.10/arch/ia64/sn/kernel/bte_error.c.orig	2005-01-06 13:20:10.954478087 -0700
++++ kernel-source-2.6.10/arch/ia64/sn/kernel/bte_error.c	2005-01-06 12:54:41.483793698 -0700
+@@ -15,6 +15,7 @@
+ #include "xtalk/xwidgetdev.h"
+ #include "xtalk/hubdev.h"
+ #include <asm/sn/bte.h>
++#include <asm/param.h>
+ 
+ /*
+  * Bte error handling is done in two parts.  The first captures
+-
+To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-irq-affinity-upfix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-irq-affinity-upfix.dpatch	2005-01-08 19:26:33 UTC (rev 2205)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-irq-affinity-upfix.dpatch	2005-01-08 21:14:22 UTC (rev 2206)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+## DP: Description: Add a no-op set_irq_affinity_info() for non-SMP
+## DP: Patch author: dann frazier <dannf@hp.com>
+## DP: Upstream status: Submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+This patch defines a no-op set_irq_affinity_info() when CONFIG_SMP is not set,
+fixing a linking error in sn_set_affinity_irq().
+
+Signed-off-by: dann frazier <dannf@hp.com>
+
+--- linux-2.6.10.orig/arch/ia64/kernel/irq.c	2004-12-24 14:35:27.000000000 -0700
++++ linux-2.6.10/arch/ia64/kernel/irq.c	2005-01-07 18:56:16.819383593 -0700
+@@ -1040,6 +1040,11 @@
+ 	}
+ }
+ 
++#else /* !CONFIG_SMP */
++
++void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
++{
++}
+ 
+ #endif /* CONFIG_SMP */
+ 
+-
+To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3	2005-01-08 19:26:33 UTC (rev 2205)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3	2005-01-08 21:14:22 UTC (rev 2206)
@@ -1,2 +1,4 @@
 - 028-do_brk_security_fixes.dpatch
 + 032-do_brk_security_fixes.dpatch
++ ia64-bte_error-missing-include.dpatch
++ ia64-irq-affinity-upfix.dpatch