From 3e439db026e368aa837ab8071fa2a270276f4d0f Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Wed, 5 Jan 2005 18:29:46 +0000 Subject: [PATCH] Taking a different approach to handling barrier(); this should hopefully prevent any userspace clashes due to the inclusion now not being invoked. --- sys-kernel/linux26-headers/ChangeLog | 8 +- sys-kernel/linux26-headers/Manifest | 4 +- .../linux26-headers-2.6.8.1-appCompat.patch | 86 ++----------------- 3 files changed, 18 insertions(+), 80 deletions(-) diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index 3f86f9d4ecd4..2faa1d442f22 100644 --- a/sys-kernel/linux26-headers/ChangeLog +++ b/sys-kernel/linux26-headers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/linux26-headers # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.47 2005/01/05 17:11:33 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.48 2005/01/05 18:29:46 plasmaroo Exp $ + + 05 Jan 2005; + files/linux26-headers-2.6.8.1-appCompat.patch: + Taking a different approach to handling barrier(); this should hopefully + prevent any userspace clashes due to the inclusion now not being + invoked. 05 Jan 2005; files/linux26-headers-2.6.8.1-strict-ansi-fix.patch: diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index e64bd13eb324..c37b3e9d214f 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -1,4 +1,4 @@ -MD5 c5073d07397e545a16fe713a8071aa91 ChangeLog 10406 +MD5 9d2d32e32d4742185b488f9c3b601ff5 ChangeLog 10657 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031 MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224 MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188 @@ -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 7ba4b1fac2a6131679648126a9f55d48 files/linux26-headers-2.6.8.1-appCompat.patch 58990 +MD5 059bc0fd9ab694075c0a27b717816f93 files/linux26-headers-2.6.8.1-appCompat.patch 57060 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 4ed46eaf536d..05da1f2ee146 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,14 +972,11 @@ 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,14 @@ +@@ -47,7 +59,11 @@ /* Optimization barrier */ #ifndef barrier -# define barrier() __memory_barrier() -+# define __ffs_X /* Prevent ffs(...) getting declared when we don't need it */ -+# include -+# undef __ffs_X +# ifdef mb +# define barrier() mb() +# else @@ -1820,79 +1817,14 @@ diff -ur linux-2.6.8.1/include/asm-alpha/signal.h linux-2.6.8.1-gentoo/include/a #ifdef __KERNEL__ #include -diff -ur linux-2.6.8.1/include/asm-alpha/bitops.h linux-2.6.8.1-gentoo/include/asm-alpha/bitops.h ---- linux-2.6.8.1/include/asm-alpha/bitops.h 2004-08-14 11:55:32.000000000 +0100 -+++ linux-2.6.8.1-gentoo/include/asm-alpha/bitops.h 2005-01-04 17:37:15.000000000 +0000 -@@ -280,6 +280,7 @@ - /* - * __ffs = Find First set bit in word. Undefined if no set bit exists. - */ -+#ifndef __ffs_X - static inline unsigned long __ffs(unsigned long word) - { - #if defined(__alpha_cix__) && defined(__alpha_fix__) -@@ -296,6 +297,7 @@ - return qofs*8 + bofs; - #endif - } -+#endif /* __ffs */ - - #ifdef __KERNEL__ - -diff -ur linux-2.6.8.1/include/asm-i386/bitops.h linux-2.6.8.1-gentoo/include/asm-i386/bitops.h ---- linux-2.6.8.1/include/asm-i386/bitops.h 2004-08-14 11:55:35.000000000 +0100 -+++ linux-2.6.8.1-gentoo/include/asm-i386/bitops.h 2005-01-04 17:37:24.000000000 +0000 -@@ -358,6 +358,7 @@ - * - * Undefined if no bit exists, so code should check against 0 first. - */ -+#ifndef __ffs_X - static inline unsigned long __ffs(unsigned long word) - { - __asm__("bsfl %1,%0" -@@ -365,6 +366,7 @@ - :"rm" (word)); - return word; - } -+#endif - - /* - * fls: find last bit set. -diff -ur linux-2.6.8.1/include/asm-ia64/bitops.h linux-2.6.8.1-gentoo/include/asm-ia64/bitops.h ---- linux-2.6.8.1/include/asm-ia64/bitops.h 2004-08-14 11:56:14.000000000 +0100 -+++ linux-2.6.8.1-gentoo/include/asm-ia64/bitops.h 2005-01-04 17:36:44.000000000 +0000 -@@ -302,6 +302,7 @@ - * - * Undefined if no bit exists, so code should check against 0 first. - */ -+#ifndef __ffs_X - static __inline__ unsigned long - __ffs (unsigned long x) - { -@@ -310,6 +311,7 @@ - result = ia64_popcnt((x-1) & ~x); - return result; - } -+#endif +diff -ur linux-2.6.8.1/include/linux/preempt.h linux-2.6.8.1-gentoo/include/linux/preempt.h +--- linux-2.6.8.1/include/linux/preempt.h 2004-08-14 11:55:32.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/linux/preempt.h 2004-12-26 19:58:15.881705760 +0000 +@@ -8,6 +8,7 @@ - #ifdef __KERNEL__ + #include + #include ++#include /* barrier() <--> mb() */ -diff -ur linux-2.6.8.1/include/asm-sparc64/bitops.h linux-2.6.8.1-gentoo/include/asm-sparc64/bitops.h ---- linux-2.6.8.1/include/asm-sparc64/bitops.h 2004-08-14 11:54:50.000000000 +0100 -+++ linux-2.6.8.1-gentoo/include/asm-sparc64/bitops.h 2005-01-04 17:36:57.000000000 +0000 -@@ -101,6 +101,7 @@ - * - * Undefined if no bit exists, so code should check against 0 first. - */ -+#ifndef __ffs_X - static __inline__ unsigned long __ffs(unsigned long word) - { - unsigned long result = 0; -@@ -111,6 +112,7 @@ - } - return result; - } -+#endif + #define preempt_count() (current_thread_info()->preempt_count) - /* - * fls: find last bit set. -- 2.26.2