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

[Sven Luther]

Author: luther
Date: 2005-02-07 07:49:36 +0100 (Mon, 07 Feb 2005)
New Revision: 2448

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/powerpc-fix-power3-ftbfs.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-5
Log:
Added workaround to power3/4 simple bootloader FTBFS. Need Urgent upload for powerpc kernels.


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-02-06 17:53:13 UTC (rev 2447)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-07 06:49:36 UTC (rev 2448)
@@ -16,8 +16,11 @@
 
   * Fix bug in tty_io due typo. (Maximilian Attems)
 
- -- Frederik Schüler <fschueler@gmx.net>  Sun, 30 Jan 2005 02:49:14 +0100
+  * [powerpc] - powerpc-fix-power3-ftbfs.dpatch
+    Fix a FTBFS with the simple bootloaders on power3/4.
 
+ -- Sven Luther <luther@debian.org>  Mon,  7 Feb 2005 07:47:11 +0100
+
 kernel-source-2.6.10 (2.6.10-4) unstable; urgency=low
 
   * Replace smbfs-overflow-fixes.patch with a newer version from 2.6.10-ac

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/powerpc-fix-power3-ftbfs.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/powerpc-fix-power3-ftbfs.dpatch	2005-02-06 17:53:13 UTC (rev 2447)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/powerpc-fix-power3-ftbfs.dpatch	2005-02-07 06:49:36 UTC (rev 2448)
@@ -0,0 +1,32 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Works around a broken build system, namely the
+## DP: Description: simple bootloader on power 3/4.
+## DP: Misc: Pulled from the ubuntu tree.
+## DP: Patch author: fabbione@ubuntu.com
+## DP: Upstream status: FTBFS fix, guess it will be fixed upstream too
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+#! /bin/sh -e
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c
+--- linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-24 22:33:51.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-28 10:43:29.838010536 +0100
+@@ -152,9 +152,11 @@
+ 		hold_residual->VitalProductData.Reserved5 = 0xdeadbeef;
+ 	}
+ 
++#if defined(CONFIG_6xx)
+ 	/* Now go and clear out the BATs and ensure that our MSR is
+ 	 * correct .*/
+ 	disable_6xx_mmu();
++#endif
+ 
+ 	/* Make r3 be a pointer to the residual data. */
+ 	return (unsigned long)hold_residual;

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5	2005-02-06 17:53:13 UTC (rev 2447)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5	2005-02-07 06:49:36 UTC (rev 2448)
@@ -3,4 +3,4 @@
 + ia64-unwind-fix.dpatch
 + amd64-ia32-vsyscall-fix.dpatch
 + char-tty-typo.dpatch
-
++ powerpc-fix-power3-ftbfs.dpatch