diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-04-14 17:10:59 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-04-14 17:10:59 +0000 |
| commit | 704e3e5a5f84d6f410968579123fedfcfb231d44 (patch) | |
| tree | 82bbf20b6a8a86f52c7a6f518b8b7b19a34ff383 /sys-kernel | |
| parent | Stable on alpha. (diff) | |
| download | gentoo-2-704e3e5a5f84d6f410968579123fedfcfb231d44.tar.gz gentoo-2-704e3e5a5f84d6f410968579123fedfcfb231d44.tar.bz2 gentoo-2-704e3e5a5f84d6f410968579123fedfcfb231d44.zip | |
Fix #86968.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch | 33 |
2 files changed, 34 insertions, 5 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index b6f9c520fa67..433e6a6589a2 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,10 @@ # 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.113 2005/04/06 04:47:27 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.114 2005/04/14 17:10:59 plasmaroo Exp $ + + 14 Apr 2005; <plasmaroo@gentoo.org> + files/linux-headers-2.6.11-appCompat.patch: + Fix #86968. 06 Apr 2005; Sven Wegener <swegener@gentoo.org> : Fixed digests for KV_EXTRA suport in kernel-2.eclass. 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 d0acdc64e549..968eff965bb6 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 @@ -1375,9 +1375,9 @@ diff -urp linux-2.6.7/include/asm-parisc/processor.h linux-2.6.7-gentoo/include/ #include <asm/system.h> #endif /* __ASSEMBLY__ */ -diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/list.h ---- linux-2.6.10/include/linux/list.h 2004-08-20 19:54:37.000000000 +0100 -+++ linux-2.6.10-gentoo/linux/list.h 2004-08-24 17:52:07.416139368 +0100 +diff -up linux-2.6.11/include/linux/list.h linux-2.6.11-gentoo/include/linux/list.h +--- linux-2.6.11/include/linux/list.h 2004-08-20 19:54:37.000000000 +0100 ++++ linux-2.6.11-gentoo/linux/list.h 2004-08-24 17:52:07.416139368 +0100 @@ -1,8 +1,6 @@ #ifndef _LINUX_LIST_H #define _LINUX_LIST_H @@ -1387,7 +1387,7 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis #include <linux/stddef.h> #include <linux/prefetch.h> #include <asm/system.h> -@@ -38,20 +36,30 @@ struct list_head { +@@ -38,20 +36,39 @@ struct list_head { (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) @@ -1399,6 +1399,15 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis + struct hlist_node *next, **pprev; +}; + ++/** ++ * list_empty - tests whether a list is empty ++ * @head: the list to test. ++ */ ++static inline int list_empty(const struct list_head *head) ++{ ++ return head->next == head; ++} ++ +#if defined(__KERNEL__) || defined(__LINUX_KEYBOARD_H) + /* @@ -1512,6 +1521,22 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis } /** +@@ -244,15 +244,6 @@ + } + + /** +- * list_empty - tests whether a list is empty +- * @head: the list to test. +- */ +-static inline int list_empty(const struct list_head *head) +-{ +- return head->next == head; +-} +- +-/** + * list_empty_careful - tests whether a list is + * empty _and_ checks that no other CPU might be + * in the process of still modifying either member @@ -496,14 +504,6 @@ static inline void list_splice_init(stru * You lose the ability to access the tail in O(1). */ |