diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-07-27 15:10:12 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-07-27 15:10:12 +0000 |
| commit | 6627b8a5d7d819f7dd9c24d86e24aa1c1a953d39 (patch) | |
| tree | 19d2cd9af5240133d48299063dc66392566d904e /sys-kernel | |
| parent | patches from uClibc (diff) | |
| download | historical-6627b8a5d7d819f7dd9c24d86e24aa1c1a953d39.tar.gz historical-6627b8a5d7d819f7dd9c24d86e24aa1c1a953d39.tar.bz2 historical-6627b8a5d7d819f7dd9c24d86e24aa1c1a953d39.zip | |
Added a fix for bug #58185.
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux26-headers/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch | 45 |
3 files changed, 34 insertions, 21 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index 7b19f008da61..95e346c6f879 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.16 2004/07/24 20:41:03 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.17 2004/07/27 15:10:12 plasmaroo Exp $ + + 27 Jul 2004; <plasmaroo@gentoo.org> + files/linux26-headers-2.6.7-appCompat.patch: + Added a fix for bug #58185. *linux26-headers-2.6.7-r4 (24 Jul 2004) diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index d8069f54b212..1c6c9f706171 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 d9c627113cfc80d3cc6e46fd42e292b0 ChangeLog 4517 +MD5 300da9f01c1d811c86d9c8b0f73d116d ChangeLog 4633 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 2667fc2e311b749aa3b61f8006a16269 files/linux26-headers-2.6.7-appCompat.patch 39929 +MD5 404177e831acfc6ca3f2fa9c7030de7c files/linux26-headers-2.6.7-appCompat.patch 40336 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 0c933be79b37..99b00e3c171b 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 @@ -536,24 +536,6 @@ diff -ur linux-2.6.4/include/asm-i386/ipc.h linux-2.6.4-gentoo/include/asm-i386/ struct ipc_kludge { struct msgbuf __user *msgp; long msgtyp; -diff -ur linux-2.6.4/include/linux/compiler-gcc3.h linux-2.6.4-gentoo/include/linux/compiler-gcc3.h ---- linux-2.6.4/include/linux/compiler-gcc3.h 2004-03-13 13:04:57.718981680 +0000 -+++ linux-2.6.4-gentoo/include/linux/compiler-gcc3.h 2004-03-13 13:15:55.937917192 +0000 -@@ -3,6 +3,8 @@ - /* These definitions are for GCC v3.x. */ - #include <linux/compiler-gcc.h> - -+#ifdef __KERNEL__ -+ - #if __GNUC_MINOR__ >= 1 - # define inline __inline__ __attribute__((always_inline)) - # define __inline__ __inline__ __attribute__((always_inline)) -@@ -25,3 +27,5 @@ - #if __GNUC_MINOR__ >= 1 - #define noinline __attribute__((noinline)) - #endif -+ -+#endif /* __KERNEL__ */ diff -ur linux-2.6.4/include/linux/mroute.h linux-2.6.4-gentoo/include/linux/mroute.h --- linux-2.6.4/include/linux/mroute.h 2004-03-13 13:04:54.084534200 +0000 +++ linux-2.6.4-gentoo/include/linux/mroute.h 2004-03-13 13:14:04.356880088 +0000 @@ -1312,3 +1294,30 @@ diff -ur linux-2.6.7/include/asm-x86_64/pda.h linux-2.6.7-gentoo/include/asm-x86 extern void __bad_pda_field(void); +diff -ur linux-2.6.7/include/linux/compiler-gcc3.h linux-2.6.7-gentoo/include/linux/compiler-gcc3.h +--- linux-2.6.7/include/linux/compiler-gcc3.h 2004-07-10 01:47:34.000000000 +0100 ++++ linux-2.6.7-gentoo/include/linux/compiler-gcc3.h 2004-07-27 13:09:20.420468272 +0100 +@@ -3,12 +3,6 @@ + /* These definitions are for GCC v3.x. */ + #include <linux/compiler-gcc.h> + +-#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4 +-# define inline __inline__ __attribute__((always_inline)) +-# define __inline__ __inline__ __attribute__((always_inline)) +-# define __inline __inline__ __attribute__((always_inline)) +-#endif +- + #if __GNUC_MINOR__ > 0 + # define __deprecated __attribute__((deprecated)) + #endif +diff -ur linux-2.6.7/include/linux/sem.h linux-2.6.7-gentoo/include/linux/sem.h +--- linux-2.6.7/include/linux/sem.h 2004-07-10 01:47:34.000000000 +0100 ++++ linux-2.6.7-gentoo/include/linux/sem.h 2004-07-27 11:48:07.440273000 +0100 +@@ -1,6 +1,7 @@ + #ifndef _LINUX_SEM_H + #define _LINUX_SEM_H + ++#include <linux/compiler.h> + #include <linux/ipc.h> + #include <asm/atomic.h> + |