Fix kbd on PPC, bounds-checking on AMD64, and C++-happiness for list.h.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 53 insertions, 6 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 3ef69894566a..e37d9184efa4 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.127 2005/05/29 23:01:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.128 2005/06/17 22:10:15 plasmaroo Exp $
+
+*linux-headers-2.6.11-r2 (17 Jun 2005)
+
+  17 Jun 2005; <plasmaroo@gentoo.org> -linux-headers-2.6.11-r1.ebuild,
+  +linux-headers-2.6.11-r2.ebuild, files/linux-headers-2.6.11-appCompat.patch:
+  Fix kbd on PPC, bounds-checking on AMD64, and C++-happiness for list.h.
 
 *linux-headers-2.6.11-r1 (29 May 2005)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index c774777efd04..59db4a863959 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,14 +1,14 @@
-MD5 b2d7b2adb28101adccecb0a19206bedc ChangeLog 26726
+MD5 6b6fc59132d2602833213b3543c5d54d ChangeLog 26991
 MD5 f77cd054b7e25a44bfe8c83094de0b7e linux-headers-2.2.26.ebuild 2514
 MD5 1e3350e5596cd13bde8ea8ad3cac169c linux-headers-2.4.23.ebuild 3484
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
+MD5 6b84bcbed103362cf1723f2dbbf23134 linux-headers-2.6.11-r2.ebuild 1533
 MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
 MD5 952afa5ec1d18abb7dcf9d4e26970d5a linux-headers-2.4.21-r1.ebuild 3947
 MD5 31e90cfffdf977c955d107db8553d1db linux-headers-2.4.26.ebuild 3354
 MD5 772d16ab14120bf4ed224c143f267b3e linux-headers-2.4.22.ebuild 4031
 MD5 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
-MD5 93004f1fca180c26762b603543e8e67c linux-headers-2.6.11-r1.ebuild 1533
 MD5 cd10168775609812266f3f571928cde1 linux-headers-2.4.21.ebuild 3733
 MD5 f229fe4d523bc5e7004c58b70ceab3bf linux-headers-2.4.26-r1.ebuild 456
 MD5 74742da16e7d510e5397f5bb1676d3b2 linux-headers-2.4.25.ebuild 3424
@@ -18,7 +18,7 @@ MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
 MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
-MD5 bcde033ae5296b57a40a143ca0e56008 files/linux-headers-2.6.11-appCompat.patch 80534
+MD5 8cfa064a47be7b0463912066200c42c7 files/linux-headers-2.6.11-appCompat.patch 81710
 MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
 MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
@@ -37,8 +37,8 @@ MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
 MD5 6dd79a655f006aebb7206203f3654976 files/linux-headers-2.6.7-generic-arm-prepare.patch 978
+MD5 f21cffda2eeeba9dedb15d75e2417046 files/digest-linux-headers-2.6.11-r2 146
 MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
 MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
-MD5 f21cffda2eeeba9dedb15d75e2417046 files/digest-linux-headers-2.6.11-r1 146
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r1 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2
index ea119c2440da..ea119c2440da 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r1
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r2
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
index c979ed5a75fd..1b735b4531de 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
@@ -642,6 +642,18 @@ diff -ur linux-2.6.6/include/asm-ppc/signal.h linux-2.6.6-gentoo/include/asm-ppc
 diff -ur linux-2.6.6/include/asm-x86_64/processor.h linux-2.6.6-gentoo/include/asm-x86_64/processor.h
 --- linux-2.6.6/include/asm-x86_64/processor.h	2004-06-02 19:25:24.000000000 +0100
 +++ linux-2.6.6-gentoo/include/asm-x86_64/processor.h	2004-06-02 19:24:31.000000000 +0100
+@@ -136,7 +136,11 @@
+  * enable), so that any CPU's that boot up
+  * after us can get the correct flags.
+  */
++#ifndef __BOUNDS_CHECKING_ON
+ extern unsigned long mmu_cr4_features;
++#else
++unsigned long mmu_cr4_features;
++#endif
+ 
+ static inline void set_in_cr4 (unsigned long mask)
+ {
 @@ -189,17 +189,17 @@
  #define INVALID_IO_BITMAP_OFFSET 0x8000
  
@@ -1543,6 +1555,24 @@ diff -up linux-2.6.11/include/linux/list.h linux-2.6.11-gentoo/include/linux/lis
  }
  
  /**
+@@ -219,12 +219,12 @@
+  *
+  * The old entry will be replaced with the new entry atomically.
+  */
+-static inline void list_replace_rcu(struct list_head *old, struct list_head *new){
+-	new->next = old->next;
+-	new->prev = old->prev;
++static inline void list_replace_rcu(struct list_head *old, struct list_head *_new){
++	_new->next = old->next;
++	_new->prev = old->prev;
+ 	smp_wmb();
+-	new->next->prev = new;
+-	new->prev->next = new;
++	_new->next->prev = _new;
++	_new->prev->next = _new;
+ }
+ 
+ /**
 @@ -244,15 +244,6 @@
  }
  
@@ -2588,6 +2618,17 @@ diff -ur linux-2.6.11/include/asm-ia64/thread_info.h linux-2.6.11-gentoo/include
  typedef __signed__ long long __s64;
  typedef unsigned long long __u64;
  #endif
+--- linux-2.6.11/include/asm-ppc/types.h	2005-03-02 07:37:31.000000000 +0000
++++ linux-2.6.11-gentoo/include/asm-ppc/types.h	2005-05-29 23:42:46.000000000 +0100
+@@ -19,7 +19,7 @@
+ typedef __signed__ int __s32;
+ typedef unsigned int __u32;
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
++#if defined(__GNUC__)
+ typedef __signed__ long long __s64;
+ typedef unsigned long long __u64;
+ #endif
 --- linux-2.6.11/include/linux/unistd.h	2005-05-24 14:58:11.000000000 +0100
 +++ linux-2.6.11-gentoo/include/linux/unistd.h	2005-05-29 23:45:34.000000000 +0100
 @@ -1,7 +1,7 @@
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
index 6cbf4cd7f1ea..be2e1eff590f 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r1.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-r1.ebuild,v 1.1 2005/05/29 23:01:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.1 2005/06/17 22:10:15 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"