Version bump. Added explicit casting to certain headers so that C++ applications like cdrdao happily compile, and a fix for a L1_CACHE_SHIFT issue. Thanks to Christian Schmidt for helping with the latter issue! Bug #56885.

5 files changed, 273 insertions, 21 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index f3017eb46364..52b5f3820ad0 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.5 2004/07/12 01:05:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.6 2004/07/13 18:22:26 plasmaroo Exp $
+
+*linux26-headers-2.6.7-r2 (13 Jul 2004)
+
+  13 Jul 2004; <plasmaroo@gentoo.org> -linux26-headers-2.6.7-r1.ebuild,
+  +linux26-headers-2.6.7-r2.ebuild,
+  files/linux26-headers-2.6.7-appCompat.patch:
+  Version bump. Added explicit casting to certain headers so that C++
+  applications like cdrdao happily compile, and a fix for a L1_CACHE_SHIFT
+  issue. Thanks to Christian Schmidt for helping with the latter issue! Bug
+  #56885.
 
   12 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
   linux26-headers-2.6.6-r1.ebuild:
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index d57afb78066a..e4d841d2d393 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,28 +1,28 @@
-MD5 521ea3584e42acbd306f054a7f31c763 ChangeLog 2205
+MD5 f2b7161be5f027a81c29e43aaa8f5559 linux26-headers-2.6.4.ebuild 4162
+MD5 deb213c657a703e2c33a0b87873fc29c ChangeLog 2636
+MD5 af0eb4504b3ba06f21850d2221503825 linux26-headers-2.6.7-r2.ebuild 3914
+MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 783f6e06e49de0761dab1ed62f86faaf linux26-headers-2.6.5.ebuild 4173
 MD5 cf1a426a2ba138f717c83370f6d49c8c linux26-headers-2.6.3-r1.ebuild 4014
-MD5 1ee0239d7175011adbaf12ec5c923a10 linux26-headers-2.6.6-r1.ebuild 4207
 MD5 e474e1ab5c458a8374bc7232ddf20613 linux26-headers-2.6.6.ebuild 4048
-MD5 f2b7161be5f027a81c29e43aaa8f5559 linux26-headers-2.6.4.ebuild 4162
-MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 e19482fa75253c9b1f766dae4b15df50 linux26-headers-2.6.1.ebuild 4097
-MD5 38f6f25b04fe0fa1f5e95b15b84809b5 linux26-headers-2.6.7-r1.ebuild 3907
-MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux26-headers-2.6.0-appCompat.patch 17983
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
-MD5 d6e1f23d0a090d6c0c0d44af0075359e files/linux26-headers-2.6.7-appCompat.patch 30277
-MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
-MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
-MD5 537c756a05fe1a6819277938d570b70a files/linux26-headers-2.6.0-strict-ansi-fix.patch 1484
+MD5 1ee0239d7175011adbaf12ec5c923a10 linux26-headers-2.6.6-r1.ebuild 4207
+MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux26-headers-2.6.1 66
 MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6 66
-MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r1 66
-MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux26-headers-2.6.3-appCompat.patch 17484
+MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
-MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux26-headers-2.6.1 66
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
 MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux26-headers-2.6.3-r1 66
+MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r2 66
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6 66
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
+MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux26-headers-2.6.3-appCompat.patch 17484
+MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
+MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux26-headers-2.6.0-appCompat.patch 17983
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 537c756a05fe1a6819277938d570b70a files/linux26-headers-2.6.0-strict-ansi-fix.patch 1484
+MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
+MD5 6d93c730501f94b18689b6c6e28dd360 files/linux26-headers-2.6.7-appCompat.patch 37436
diff --git a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r1 b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r2
index fbf6945c9a39..fbf6945c9a39 100644
--- a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r1
+++ b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r2
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
index 169fdda7fc87..920f96de2973 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
@@ -1005,3 +1005,245 @@ diff -ur linux-2.6.6/include/linux/hiddev.h linux-2.6.6-gentoo/include/linux/hid
  struct hiddev_event {
  	unsigned hid;
  	signed int value;
+diff -ur linux-2.6.7/include/asm-i386/cache.h linux-2.6.7-gentoo/include/asm-i386/cache.h
+--- linux-2.6.7/include/asm-i386/cache.h	2004-07-13 16:33:15.000000000 +0200
++++ linux-2.6.7-gentoo/include/asm-i386/cache.h	2004-07-13 16:50:38.384364344 +0200
+@@ -7,7 +7,11 @@
+ #include <linux/config.h>
+ 
+ /* L1 cache line size */
++#ifndef CONFIG_X86_L1_CACHE_SHIFT
++#define L1_CACHE_SHIFT 7  /* 7 is given with X86_GENERIC kernel config */
++#else
+ #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
++#endif
+ #define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
+ 
+ #define L1_CACHE_SHIFT_MAX 7	/* largest L1 which this arch supports */
+diff -ur linux-2.6.7/include/asm-i386/system.h linux-2.6.7-gentoo/include/asm-i386/system.h
+--- linux-2.6.7/include/asm-i386/system.h	2004-06-16 07:18:38.000000000 +0200
++++ linux-2.6.7-gentoo/include/asm-i386/system.h	2004-07-13 16:34:50.632444536 +0200
+@@ -244,26 +244,26 @@
+ #endif
+ 
+ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+-				      unsigned long new, int size)
++				      unsigned long _new, int size)
+ {
+ 	unsigned long prev;
+ 	switch (size) {
+ 	case 1:
+ 		__asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
+ 				     : "=a"(prev)
+-				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
++				     : "q"(_new), "m"(*__xg(ptr)), "0"(old)
+ 				     : "memory");
+ 		return prev;
+ 	case 2:
+ 		__asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
+ 				     : "=a"(prev)
+-				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
++				     : "q"(_new), "m"(*__xg(ptr)), "0"(old)
+ 				     : "memory");
+ 		return prev;
+ 	case 4:
+ 		__asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
+ 				     : "=a"(prev)
+-				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
++				     : "q"(_new), "m"(*__xg(ptr)), "0"(old)
+ 				     : "memory");
+ 		return prev;
+ 	}
+diff -ur linux-2.6.7/include/linux/list.h linux-2.6.7-gentoo/include/linux/list.h
+--- linux-2.6.7/include/linux/list.h	2004-07-13 16:27:12.280124680 +0200
++++ linux-2.6.7-gentoo/include/linux/list.h	2004-07-13 16:34:31.467358072 +0200
+@@ -42,14 +50,14 @@
+  * This is only for internal list manipulation where we know
+  * the prev/next entries already!
+  */
+-static inline void __list_add(struct list_head *new,
++static inline void __list_add(struct list_head *_new,
+ 			      struct list_head *prev,
+ 			      struct list_head *next)
+ {
+-	next->prev = new;
+-	new->next = next;
+-	new->prev = prev;
+-	prev->next = new;
++	next->prev = _new;
++	_new->next = next;
++	_new->prev = prev;
++	prev->next = _new;
+ }
+ 
+ /**
+@@ -60,9 +68,9 @@
+  * Insert a new entry after the specified head.
+  * This is good for implementing stacks.
+  */
+-static inline void list_add(struct list_head *new, struct list_head *head)
++static inline void list_add(struct list_head *_new, struct list_head *head)
+ {
+-	__list_add(new, head, head->next);
++	__list_add(_new, head, head->next);
+ }
+ 
+ /**
+@@ -73,9 +81,9 @@
+  * Insert a new entry before the specified head.
+  * This is useful for implementing queues.
+  */
+-static inline void list_add_tail(struct list_head *new, struct list_head *head)
++static inline void list_add_tail(struct list_head *_new, struct list_head *head)
+ {
+-	__list_add(new, head->prev, head);
++	__list_add(_new, head->prev, head);
+ }
+ 
+ /*
+@@ -84,14 +92,14 @@
+  * This is only for internal list manipulation where we know
+  * the prev/next entries already!
+  */
+-static inline void __list_add_rcu(struct list_head * new,
++static inline void __list_add_rcu(struct list_head * _new,
+ 		struct list_head * prev, struct list_head * next)
+ {
+-	new->next = next;
+-	new->prev = prev;
++	_new->next = next;
++	_new->prev = prev;
+ 	smp_wmb();
+-	next->prev = new;
+-	prev->next = new;
++	next->prev = _new;
++	prev->next = _new;
+ }
+ 
+ /**
+@@ -110,9 +118,9 @@
+  * the _rcu list-traversal primitives, such as
+  * list_for_each_entry_rcu().
+  */
+-static inline void list_add_rcu(struct list_head *new, struct list_head *head)
++static inline void list_add_rcu(struct list_head *_new, struct list_head *head)
+ {
+-	__list_add_rcu(new, head, head->next);
++	__list_add_rcu(_new, head, head->next);
+ }
+ 
+ /**
+@@ -131,10 +139,10 @@
+  * the _rcu list-traversal primitives, such as
+  * list_for_each_entry_rcu().
+  */
+-static inline void list_add_tail_rcu(struct list_head *new,
++static inline void list_add_tail_rcu(struct list_head *_new,
+ 					struct list_head *head)
+ {
+-	__list_add_rcu(new, head->prev, head);
++	__list_add_rcu(_new, head->prev, head);
+ }
+ 
+ /*
+diff -ur linux-2.6.7/compiler.h linux-2.6.7-gentoo/compiler.h
+--- linux-2.6.7/compiler.h	2004-07-13 19:00:02.464663368 +0100
++++ linux-2.6.7-gentoo/compiler.h	2004-07-13 18:44:43.000000000 +0100
+@@ -27,8 +27,6 @@
+ #endif
+ #endif
+ 
+-#ifdef __KERNEL__
+-
+ #ifndef __ASSEMBLY__
+ #if __GNUC__ > 3
+ # include <linux/compiler-gcc+.h>	/* catch-all for GCC 4, 5, etc. */
+@@ -69,8 +67,6 @@
+     (typeof(ptr)) (__ptr + (off)); })
+ #endif
+ 
+-#endif /* __KERNEL__ */
+-
+ /*
+  * Allow us to mark functions as 'deprecated' and have gcc emit a nice
+  * warning for each use, in hopes of speeding the functions removal.
+@@ -132,4 +128,10 @@
+ #define noinline
+ #endif
+ 
++#ifdef __cplusplus
++#define __cast__(_to) (_to)
++#else
++#define __cast__(_to)
++#endif
++
+ #endif /* __LINUX_COMPILER_H */
+diff -ur linux-2.6.7/list.h linux-2.6.7-gentoo/list.h
+--- linux-2.6.7/list.h	2004-07-13 19:00:02.453665040 +0100
++++ linux-2.6.7-gentoo/list.h	2004-07-13 18:44:43.000000000 +0100
+@@ -159,8 +159,8 @@
+ static inline void list_del(struct list_head *entry)
+ {
+ 	__list_del(entry->prev, entry->next);
+-	entry->next = LIST_POISON1;
+-	entry->prev = LIST_POISON2;
++	entry->next = __cast__(list_head*) LIST_POISON1;
++	entry->prev = __cast__(list_head*) LIST_POISON2;
+ }
+ 
+ /**
+@@ -190,7 +190,7 @@
+ static inline void list_del_rcu(struct list_head *entry)
+ {
+ 	__list_del(entry->prev, entry->next);
+-	entry->prev = LIST_POISON2;
++	entry->prev = __cast__(list_head*) LIST_POISON2;
+ }
+ 
+ /**
+@@ -504,8 +504,8 @@
+ 
+ static inline void __hlist_del(struct hlist_node *n)
+ {
+-	struct hlist_node *next = n->next;
+-	struct hlist_node **pprev = n->pprev;
++	struct hlist_node *next = __cast__(hlist_node*) n->next;
++	struct hlist_node **pprev = __cast__(hlist_node**) n->pprev;
+ 	*pprev = next;
+ 	if (next)
+ 		next->pprev = pprev;
+@@ -514,8 +514,8 @@
+ static inline void hlist_del(struct hlist_node *n)
+ {
+ 	__hlist_del(n);
+-	n->next = LIST_POISON1;
+-	n->pprev = LIST_POISON2;
++	n->next = __cast__(hlist_node*) LIST_POISON1;
++	n->pprev = __cast__(hlist_node**) LIST_POISON2;
+ }
+ 
+ /**
+@@ -540,7 +540,7 @@
+ static inline void hlist_del_rcu(struct hlist_node *n)
+ {
+ 	__hlist_del(n);
+-	n->pprev = LIST_POISON2;
++	n->pprev = __cast__(hlist_node**) LIST_POISON2;
+ }
+ 
+ static inline void hlist_del_init(struct hlist_node *n)
+diff -ur linux-2.6.7/prefetch.h linux-2.6.7-gentoo/prefetch.h
+--- linux-2.6.7/prefetch.h	2004-07-13 19:00:02.450665496 +0100
++++ linux-2.6.7-gentoo/prefetch.h	2004-07-13 18:44:43.000000000 +0100
+@@ -59,9 +59,9 @@
+ {
+ #ifdef ARCH_HAS_PREFETCH
+ 	char *cp;
+-	char *end = addr + len;
++	char *end = __cast__(char *) addr + len;
+ 
+-	for (cp = addr; cp < end; cp += PREFETCH_STRIDE)
++	for (cp = __cast__(char *) addr; cp < end; cp += PREFETCH_STRIDE)
+ 		prefetch(cp);
+ #endif
+ }
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild
index 648e9300bcf3..fc3e9c0b3dc9 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r1.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r1.ebuild,v 1.5 2004/07/11 02:39:50 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild,v 1.1 2004/07/13 18:22:26 plasmaroo Exp $
 
 ETYPE="headers"
 inherit kernel eutils