From 47533cd21984e98ca0e0dd681beb396b15309463 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Sun, 24 Apr 2005 14:22:50 +0000 Subject: Backport #86968 fix to 2.6.8.1 headers. (Portage version: 2.0.51.19) --- sys-kernel/linux-headers/ChangeLog | 6 ++++- .../files/linux-headers-2.6.8.1-appCompat.patch | 27 +++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'sys-kernel') diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 279fa041a477..0f15f575f702 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.117 2005/04/21 18:36:17 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.118 2005/04/24 14:22:50 plasmaroo Exp $ + + 24 Apr 2005; + files/linux-headers-2.6.8.1-appCompat.patch: + Backport #86968 fix to 2.6.8.1 headers. 21 Apr 2005; files/linux-headers-2.6.11-appCompat.patch: diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch index ad9e140645a7..dd35bd7909e3 100644 --- a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch +++ b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch @@ -1332,10 +1332,19 @@ diff -up linux-2.6.8.1/include/linux/list.h linux-2.6.8.1-gentoo/include/linux/l #include #include #include -@@ -38,20 +36,22 @@ struct list_head { +@@ -38,20 +36,31 @@ struct list_head { (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) ++/** ++ * 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) + /* @@ -1449,6 +1458,22 @@ diff -up linux-2.6.8.1/include/linux/list.h linux-2.6.8.1-gentoo/include/linux/l } /** +@@ -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 @@ -506,8 +506,8 @@ static inline int hlist_empty(const stru static inline void __hlist_del(struct hlist_node *n) -- cgit v1.2.3-65-gdbad