diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-06-24 09:06:57 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-06-24 09:06:57 +0000 |
| commit | 7ff0db9ec8bfdb5072ee94ce1e67762102c44a93 (patch) | |
| tree | 3f2946d26231e7f3258458efd820f03aa5599b71 /sys-kernel | |
| parent | Added to ~ppc (diff) | |
| download | historical-7ff0db9ec8bfdb5072ee94ce1e67762102c44a93.tar.gz historical-7ff0db9ec8bfdb5072ee94ce1e67762102c44a93.tar.bz2 historical-7ff0db9ec8bfdb5072ee94ce1e67762102c44a93.zip | |
Added a few missing bits from <linux/compiler.h> that were removed from upstream but are still needed. Fixes bug #54542.
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch | 22 |
3 files changed, 30 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 96e6b615231f..4c86c657dc7e 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.80 2004/06/24 08:32:36 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.81 2004/06/24 09:06:57 plasmaroo Exp $ + + 24 Jun 2004; <plasmaroo@gentoo.org> + files/linux-headers-2.6.7-appCompat.patch: + Added a few missing bits from <linux/compiler.h> that were removed from + upstream but are still needed. Fixes bug #54542. 24 Jun 2004; <plasmaroo@gentoo.org> linux-headers-2.6.6-r1.ebuild: Added "cd ${S}" so this doesn't fail under amd64. Closes bug #54949. diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 7cddb6912f0b..236b5f8f8583 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -1,4 +1,4 @@ -MD5 1900475f3ff496a877d11c540aee505b ChangeLog 18407 +MD5 a1b4750ed1e888ebc25aaaaf5f1ef0ca ChangeLog 18616 MD5 f87b4fc010d3c4eb19b50e508227803b linux-headers-2.6.4.ebuild 4175 MD5 77676c4e044f3f4541426fe50f9a56e3 linux-headers-2.2.26.ebuild 2481 MD5 791793b413543b3249d2d710ef616572 linux-headers-2.4.23.ebuild 3419 @@ -26,7 +26,7 @@ MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67 MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux-headers-2.6.7 66 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67 -MD5 fdddc53af65793602d2c14df57a2d970 files/linux-headers-2.6.7-appCompat.patch 28971 +MD5 b20951b6bfe31b7307604df8b1b6492e files/linux-headers-2.6.7-appCompat.patch 29721 MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux-headers-2.6.6-r1 66 diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch index 0f07bc038e20..afc8102d3575 100644 --- a/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch +++ b/sys-kernel/linux-headers/files/linux-headers-2.6.7-appCompat.patch @@ -964,3 +964,25 @@ diff -ur linux-2.6.7/include/linux/fd.h linux-2.6.7-gentoo/include/linux/fd.h #include <linux/ioctl.h> /* New file layout: Now the ioctl definitions immediately follow the +diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/compiler.h +--- linux-2.6.7/include/linux/compiler.h 2004-06-12 12:11:54.000000000 +0100 ++++ linux-2.6.7-gentoo/include/linux/compiler.h 2004-06-24 09:48:32.478502752 +0100 +@@ -15,6 +15,18 @@ + # define __chk_user_ptr(x) (void)0 + #endif + ++#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) ++#define inline __inline__ __attribute__((always_inline)) ++#define __inline__ __inline__ __attribute__((always_inline)) ++#define __inline __inline__ __attribute__((always_inline)) ++#ifndef asm ++# define asm __asm__ ++#endif ++#ifndef volatile ++# define volatile __volatile__ ++#endif ++#endif ++ + #ifdef __KERNEL__ + + #ifndef __ASSEMBLY__ |