diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-01-04 19:58:10 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-01-04 19:58:10 +0000 |
| commit | e32708926fa26df271db7a06d2cb79fac481a886 (patch) | |
| tree | 823e7565eeca08bd70bb6718d2a1eb3c0e43c3ff /sys-kernel | |
| parent | version bumped, advance stable version and cleaned up obsolete versions (diff) | |
| download | historical-e32708926fa26df271db7a06d2cb79fac481a886.tar.gz historical-e32708926fa26df271db7a06d2cb79fac481a886.tar.bz2 historical-e32708926fa26df271db7a06d2cb79fac481a886.zip | |
Updating patch to prevent ffs(...) getting declared when not needed to not cause conflicts.
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux26-headers/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index e0719e8f6e96..9d35103ecaba 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -21,7 +21,7 @@ MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386 MD5 9101139b0720280f338a1823c281ee84 files/linux26-headers-2.6.8.1-parisc-syscall.patch 413 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689 MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240 -MD5 aaeefcdf049bbb51aa8da8892ff086a9 files/linux26-headers-2.6.8.1-appCompat.patch 58456 +MD5 6394b51aaf6800dce1dd7a710776dc9e files/linux26-headers-2.6.8.1-appCompat.patch 58549 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 diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch index 62d102a34463..9d0272aaf5bb 100644 --- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch +++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch @@ -972,12 +972,14 @@ diff -ur linux-2.6.8.1/include/linux/compiler.h linux-2.6.8.1-gentoo/include/lin /* Intel compiler defines __GNUC__. So we will overwrite implementations * coming from above header files here -@@ -47,7 +59,12 @@ +@@ -47,7 +59,14 @@ /* Optimization barrier */ #ifndef barrier -# define barrier() __memory_barrier() ++# define __ffs /* Prevent ffs(...) getting declared when we don't need it */ +# include <asm/system.h> ++# undef __ffs +# ifdef mb +# define barrier() mb() +# else |