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

[Sven Luther]

Author: luther
Date: 2005-03-05 15:02:19 +0100 (Sat, 05 Mar 2005)
New Revision: 2617

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-altivec-raid6.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
Added altivec-raid6 dpatch, to fix FTBFS on powerpc.


Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-altivec-raid6.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-altivec-raid6.dpatch	2005-03-05 12:27:45 UTC (rev 2616)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-altivec-raid6.dpatch	2005-03-05 14:02:19 UTC (rev 2617)
@@ -0,0 +1,27 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: trivial fix for 2.6.11 raid6 compilation on ppc w/ Altivec
+## DP: Patch authors: Rene Rebe <rene@exactcode.de>, lof Johansson <olof@austin.ibm.com>
+## DP: Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+## DP: Upstream status: backport
+## DP: BK URL: http://linux-release.bkbits.net:8080/linux-2.6.11/cset@42275e48-I3uxcQObgzAOX9FjPOijA?nav=index.html|ChangeSet@-2d
+## DP: BK URL: http://linux-release.bkbits.net:8080/linux-2.6.11/cset@42279a5bewn986Gth9TPkr_7XkLBrQ?nav=index.html|ChangeSet@-2d
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.11/drivers/md/raid6altivec.uc.orig	2005-03-05 14:57:39.266272264 +0100
++++ kernel-source-2.6.11/drivers/md/raid6altivec.uc	2005-03-05 14:58:34.367895544 +0100
+@@ -108,7 +108,11 @@
+ int raid6_have_altivec(void)
+ {
+ 	/* This assumes either all CPUs have Altivec or none does */
++#ifdef CONFIG_PPC64
+ 	return cur_cpu_spec->cpu_features & CPU_FTR_ALTIVEC;
++#else
++	return cur_cpu_spec[0]->cpu_features & CPU_FTR_ALTIVEC;
++#endif
+ }
+ #endif
+ 

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-05 12:27:45 UTC (rev 2616)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-05 14:02:19 UTC (rev 2617)
@@ -34,6 +34,7 @@
 + sparc64-sb1500-clock-2.6.dpatch
 + powerpc-g3-750cxe.dpatch
 + powerpc-calibrate-tau.dpatch
++ powerpc-altivec-raid6.dpatch
 + fbdev-radeon-noaccel.dpatch
 + sparc32-hypersparc-srmmu.dpatch
 + fix-alpha-ext3-oops.dpatch