From: Tim Yamin Date: Tue, 4 Jan 2005 01:46:05 +0000 (+0000) Subject: Fix on PPC for bug #76358. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19cdb0d92ae421a5e2afd9d233038bb85bfa6bd9;p=gentoo.git Fix on PPC for bug #76358. --- diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index ee506283fe98..b3b2fe722b06 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.42 2004/12/30 12:22:17 vapier Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.43 2005/01/04 01:46:05 plasmaroo Exp $ + + 04 Jan 2005; + files/linux26-headers-2.6.8.1-appCompat.patch: + Fix on PPC for bug #76358. 30 Dec 2004; Mike Frysinger +files/linux26-headers-2.6.8.1-parisc-syscall.patch, diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index 20a5a9826356..6f99190b271c 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -1,39 +1,29 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e562f2c04ad805bb00b9602854006123 ChangeLog 9772 -MD5 58516a09eebcaa2239ea0b70f310484e linux26-headers-2.6.8.1.ebuild 3895 -MD5 89403525f4da5e8458fd7f720d6de6ee linux26-headers-2.6.6-r1.ebuild 4223 -MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224 +MD5 1d99ec297f254e080ed01cc4a64da83b ChangeLog 9892 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031 +MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224 MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188 +MD5 89403525f4da5e8458fd7f720d6de6ee linux26-headers-2.6.6-r1.ebuild 4223 +MD5 58516a09eebcaa2239ea0b70f310484e linux26-headers-2.6.8.1.ebuild 3895 MD5 404765240b09b151a8b5e14b18a542a3 linux26-headers-2.6.8.1-r1.ebuild 5045 MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1 68 -MD5 14a0de85d11206096f05e186cebab07b files/linux26-headers-2.6.8.1-appCompat.patch 53549 -MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086 -MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66 +MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166 MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654 -MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386 +MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631 +MD5 602f7309c0163c018627f06b5f1ace3a files/linux26-headers-2.6.8.1-arm-float.patch 640 +MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352 -MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166 +MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086 +MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528 +MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978 MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362 +MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux26-headers-2.6.8.1-r1 146 +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 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288 -MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608 +MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240 +MD5 619585c96ff155c5bd0af32635d25358 files/linux26-headers-2.6.8.1-appCompat.patch 54898 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66 -MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978 -MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528 +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 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240 -MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux26-headers-2.6.8.1-r1 146 -MD5 00e5bea1e925c2d81d32191937eb8d5b files/linux26-headers-soundcard-ppc64.patch 631 -MD5 9101139b0720280f338a1823c281ee84 files/linux26-headers-2.6.8.1-parisc-syscall.patch 413 -MD5 602f7309c0163c018627f06b5f1ace3a files/linux26-headers-2.6.8.1-arm-float.patch 640 +MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608 MD5 5258c64bed51646ee05cde4fbc40ae03 files/linux26-headers-2.6.8.1-sparc-glibcsafe.patch 2886 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFB2cddroRuSHgZdywRAn9PAJ0UZA7rogSqOLi76YXrVYYncYoQ3wCfbu1V -Vs7qfnPyut4KkDXEqUKJWf8= -=o/zW ------END PGP SIGNATURE----- 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 87e33b1cb6e7..a727ced8468a 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 @@ -940,9 +940,9 @@ diff -ur linux-2.6.7/include/linux/fd.h linux-2.6.7-gentoo/include/linux/fd.h #include /* 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 +diff -ur linux-2.6.8.1/include/linux/compiler.h linux-2.6.8.1-gentoo/include/linux/compiler.h +--- linux-2.6.8.1/include/linux/compiler.h 2004-06-12 12:11:54.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/linux/compiler.h 2004-06-24 09:48:32.478502752 +0100 @@ -15,8 +15,19 @@ # define __chk_user_ptr(x) (void)0 #endif @@ -972,7 +972,21 @@ diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/c /* Intel compiler defines __GNUC__. So we will overwrite implementations * coming from above header files here -@@ -57,8 +69,6 @@ +@@ -47,7 +59,12 @@ + + /* Optimization barrier */ + #ifndef barrier +-# define barrier() __memory_barrier() ++# include ++# ifdef mb ++# define barrier() mb() ++# else ++# define barrier() __asm__ __volatile__ ("" : : : "memory") ++# endif + #endif + + #ifndef RELOC_HIDE +@@ -57,8 +74,6 @@ (typeof(ptr)) (__ptr + (off)); }) #endif @@ -981,7 +995,7 @@ diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/c /* * Allow us to mark functions as 'deprecated' and have gcc emit a nice * warning for each use, in hopes of speeding the functions removal. -@@ -120,4 +130,10 @@ +@@ -124,4 +139,10 @@ #define noinline #endif @@ -1695,3 +1709,43 @@ diff -ur linux-2.6.8.1/include/asm-ia64/fpu.h linux-2.6.8.1-gentoo/include/asm-i # endif /* __ASSEMBLY__ */ +diff -ur linux-2.6.8.1/include/asm-ppc/bitops.h linux-2.6.8.1-gentoo/include/asm-ppc/bitops.h +--- linux-2.6.8.1/include/asm-ppc/bitops.h 2004-08-14 11:55:32.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/asm-ppc/bitops.h 2004-12-26 19:58:15.881705760 +0000 +@@ -2,9 +2,9 @@ + * bitops.h: Bit string operations on the ppc + */ + +-#ifdef __KERNEL__ + #ifndef _PPC_BITOPS_H + #define _PPC_BITOPS_H ++#ifdef __KERNEL__ + + #include + #include +@@ -251,6 +251,8 @@ + return __ilog2(x & -x) + 1; + } + ++#endif /* __KERNEL__ */ ++ + /* + * fls: find last (most-significant) bit set. + * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. +@@ -263,6 +265,8 @@ + return 32 - lz; + } + ++#ifdef __KERNEL__ ++ + /* + * hweightN: returns the hamming weight (i.e. the number + * of bits set) of a N-bit word +@@ -456,5 +460,6 @@ + #define minix_test_bit(nr,addr) ext2_test_bit(nr,addr) + #define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size) + +-#endif /* _PPC_BITOPS_H */ + #endif /* __KERNEL__ */ ++#endif /* _PPC_BITOPS_H */ ++