summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-kernel/linux26-headers/ChangeLog6
-rw-r--r--sys-kernel/linux26-headers/Manifest4
-rw-r--r--sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch38
3 files changed, 44 insertions, 4 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index ba0f04c258d1..bc5e7eea5286 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,10 @@
# 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.18 2004/07/28 15:21:28 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.19 2004/08/02 10:04:09 plasmaroo Exp $
+
+ 02 Aug 2004; <plasmaroo@gentoo.org>
+ files/linux26-headers-2.6.7-appCompat.patch:
+ Fix for tvision, bug #59032.
28 Jul 2004; <plasmaroo@gentoo.org>
files/linux26-headers-2.6.7-appCompat.patch:
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index 7c2fe318b8f8..3cc41aab9235 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,5 +1,5 @@
MD5 26b9fb030b07a5a83e25ea025c17e8b3 linux26-headers-2.6.4.ebuild 4176
-MD5 1e0fe92ccb8d9554797df310e29c0bfa ChangeLog 4784
+MD5 226bd8a4361c56c948c862c99bdc6453 ChangeLog 4901
MD5 1dad9e980303b16196cb0b5408fa85e4 linux26-headers-2.6.7-r4.ebuild 3889
MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
MD5 35eda8dd7aa6785dae7c32d95f7fc47c linux26-headers-2.6.5.ebuild 4187
@@ -28,4 +28,4 @@ MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66
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 8fbf8b2f6ede9687845c0aefb68dc40a files/linux26-headers-2.6.7-appCompat.patch 42076
+MD5 0adbe01816401151780a13bbe1c708f6 files/linux26-headers-2.6.7-appCompat.patch 43136
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 db1ef1466361..e119c0e8a3c2 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
@@ -935,7 +935,43 @@ diff -ur linux-2.6.7/include/linux/wait.h linux-2.6.7-gentoo/include/linux/wait.
#include <linux/stddef.h>
#include <linux/spinlock.h>
#include <asm/system.h>
-@@ -258,6 +257,4 @@
+@@ -84,6 +83,8 @@
+ extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait));
+ extern void FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
+
++#ifdef __KERNEL__
++
+ static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)
+ {
+ list_add(&new->task_list, &head->task_list);
+@@ -104,6 +105,8 @@
+ list_del(&old->task_list);
+ }
+
++#endif /* __KERNEL__ */
++
+ void FASTCALL(__wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key));
+ extern void FASTCALL(__wake_up_locked(wait_queue_head_t *q, unsigned int mode));
+ extern void FASTCALL(__wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr));
+@@ -201,6 +204,8 @@
+ __ret; \
+ })
+
++#ifdef __KERNEL__
++
+ /*
+ * Must be called with the spinlock in the wait_queue_head_t held.
+ */
+@@ -220,6 +225,8 @@
+ __remove_wait_queue(q, wait);
+ }
+
++#endif /* __KERNEL__ */
++
+ /*
+ * These are the old interfaces to sleep waiting for an event.
+ * They are racy. DO NOT use them, use the wait_event* interfaces above.
+@@ -258,6 +265,4 @@
INIT_LIST_HEAD(&wait->task_list); \
} while (0)