Add patch for bug #103374 and bug #109501.

(Portage version: 2.0.53_rc6)

5 files changed, 39 insertions, 16 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 26bd9a181664..df312312ecb3 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.146 2005/10/26 17:28:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.147 2005/10/28 06:00:32 dostrow Exp $
+
+  28 Oct 2005; <dostrow@gentoo.org> +files/2.6.11-ppc64-32ul-spinlock.patch,
+  linux-headers-2.6.11-r2.ebuild:
+  Add patch for bug #103374 and bug #109501.
+  Will have plasmaroo add to the patchball when he returns.
 
   26 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   linux-headers-2.4.26-r1.ebuild:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 9db1d0374ddc..5526fadf14ed 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3d1dbc6f5243c5668bed5cb7cddba3cf ChangeLog 29493
+MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
@@ -14,7 +12,7 @@ MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
-MD5 4a449fb131784834bd2882270028fe5e files/digest-linux-headers-2.6.11-r2 221
+MD5 cb585d867113ccb42003ad196dfb1e01 files/digest-linux-headers-2.6.11-r2 221
 MD5 48ebb9368ff477da66306503da02c6fd files/digest-linux-headers-2.6.8.1-r4 222
 MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
 MD5 1c81c4ed9c2867aa281bbabbf507e096 files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
@@ -33,13 +31,6 @@ MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
 MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
 MD5 dcee8575f1f399a0b44307bbb839dbcc linux-headers-2.4.26-r1.ebuild 552
 MD5 6a3b45eded92aace1a5df1a478fa977b linux-headers-2.4.26.ebuild 3340
-MD5 316e0b929bc443b864614e9434445dd1 linux-headers-2.6.11-r2.ebuild 1536
+MD5 8a6a7c479c36982bead0fb89cae91b72 linux-headers-2.6.11-r2.ebuild 1772
 MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDYXopgIKl8Uu19MoRArqmAJ976kj3KcsOEpPs3jVdG7el925JjACeNLDt
-w2eEaDrDF2EHtQaE6PPa+bA=
-=CqWm
------END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/files/2.6.11-ppc64-32ul-spinlock.patch b/sys-kernel/linux-headers/files/2.6.11-ppc64-32ul-spinlock.patch
new file mode 100644
index 000000000000..d57d377967a4
--- /dev/null
+++ b/sys-kernel/linux-headers/files/2.6.11-ppc64-32ul-spinlock.patch
@@ -0,0 +1,21 @@
+--- linux-2.6.11.orig/include/asm-ppc/spinlock.h	2005-10-28 04:42:11.000000000 +0000
++++ linux-2.6.11/include/asm-ppc/spinlock.h	2005-10-28 04:44:55.000000000 +0000
+@@ -19,7 +19,17 @@
+ } spinlock_t;
+ 
+ #ifndef __KERNEL__
+-#define SPIN_LOCK_UNLOCKED	(spinlock_t) { 0 }
++
++typedef struct {
++	volatile signed int lock;
++#ifdef CONFIG_PREEMPT
++	unsigned int break_lock;
++#endif
++} rwlock_t;
++
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
++#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
++
+ #endif
+ 
+ #ifdef __KERNEL__
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2
index fb246145e85b..8ccab07996f2 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2
@@ -1,3 +1,3 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090
 MD5 4197da32cddfea28c963712c6c366408 gentoo-headers-2.6.11-5.tar.bz2 20873
+MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
index 774a574ed13f..33ebdb26011a 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.17 2005/09/29 14:38:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.18 2005/10/28 06:00:32 dostrow Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
@@ -36,4 +36,10 @@ src_unpack() {
 	mv iSeries asm-ppc64/
 	headers___fix asm-ppc64/iSeries/*
 	headers___fix linux/{ethtool,jiffies}.h
+
+	# Apply patch for spinlick.h only with 32bit userland on ppc64.
+	# Will add to the main patchball when plasmaroo returns.
+	if use ppc && [[ ${PROFILE_ARCH} == "ppc64" ]]; then
+		epatch ${FILESDIR}/2.6.11-ppc64-32ul-spinlock.patch
+	fi
 }