r2948 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[Sven Luther]

Author: luther
Date: 2005-04-08 11:30:41 +0000 (Fri, 08 Apr 2005)
New Revision: 2948

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-prep-motorola-irq-fix.patch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-3
Log:
Added motorola powerstack II Utah irq setup fix, thanks to Leigh Brown for
having fixed it.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-04-08 08:30:35 UTC (rev 2947)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-04-08 11:30:41 UTC (rev 2948)
@@ -15,6 +15,10 @@
     o ALSA: Fix oops in timer event notification
     (Simon Horman)
 
+  * Disabled prep_pib_init, since it broke Motorola Powerstack II Utah boxes,
+    other Motorola PReP boxes situation is unclear, either with or without the
+    patch in question (Sven Luther)
+
  -- Simon Horman <horms@debian.org>  Fri,  8 Apr 2005 14:26:07 +0900
 
 kernel-source-2.6.11 (2.6.11-2) unstable; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-prep-motorola-irq-fix.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-prep-motorola-irq-fix.patch	2005-04-08 08:30:35 UTC (rev 2947)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-prep-motorola-irq-fix.patch	2005-04-08 11:30:41 UTC (rev 2948)
@@ -0,0 +1,27 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fixes PReP Motorola Powerstack II Utah scsi build.
+## DP: Patch authors: Leigh Brown <leigh@solinno.co.uk>, Sven Luther <luther@debian.org>
+## DP: Upstream status: under investigation.
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.11/arch/ppc/platforms/prep_pci.c.orig	2005-04-08 12:54:40.000000000 +0200
++++ kernel-source-2.6.11/arch/ppc/platforms/prep_pci.c	2005-04-08 13:25:39.000000000 +0200
+@@ -1246,7 +1246,13 @@
+ 	}
+ 
+ 	/* Setup the Winbond or Via PIB */
+-	prep_pib_init();
++	/* Setup the Winbond or Via PIB - prep_pib_init() is coded for
++	 * the non-openpic case, but it breaks (at least) the Utah
++	 * (Powerstack II Pro4000), so only call it if we have an
++	 * openpic.
++	 */
++	if (have_openpic)
++		prep_pib_init();
+ }
+ 
+ static void __init

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-3	2005-04-08 08:30:35 UTC (rev 2947)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-3	2005-04-08 11:30:41 UTC (rev 2948)
@@ -1,2 +1,3 @@
 - patch-2.6.11.6.patch
 + patch-2.6.11.7.patch
++ powerpc-prep-motorola-irq-fix.patch