summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-07-28 15:21:28 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-07-28 15:21:28 +0000
commit514eca5515af05deb0dc1b3421c4faf0897c84aa (patch)
tree84426fa4a7b63538fdfc0992e78dc46104a48ca3 /sys-kernel/linux26-headers
parentFixed depends. (diff)
downloadhistorical-514eca5515af05deb0dc1b3421c4faf0897c84aa.tar.gz
historical-514eca5515af05deb0dc1b3421c4faf0897c84aa.tar.bz2
historical-514eca5515af05deb0dc1b3421c4faf0897c84aa.zip
Added a fix for bug #58299 on AMD64, and also some IA64 fixes.
Diffstat (limited to 'sys-kernel/linux26-headers')
-rw-r--r--sys-kernel/linux26-headers/ChangeLog6
-rw-r--r--sys-kernel/linux26-headers/Manifest4
-rw-r--r--sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch54
3 files changed, 61 insertions, 3 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 95e346c6f879..ba0f04c258d1 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.17 2004/07/27 15:10:12 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.18 2004/07/28 15:21:28 plasmaroo Exp $
+
+ 28 Jul 2004; <plasmaroo@gentoo.org>
+ files/linux26-headers-2.6.7-appCompat.patch:
+ Added a fix for bug #58299 on AMD64, and also some IA64 fixes.
27 Jul 2004; <plasmaroo@gentoo.org>
files/linux26-headers-2.6.7-appCompat.patch:
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index 1c6c9f706171..7c2fe318b8f8 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 300da9f01c1d811c86d9c8b0f73d116d ChangeLog 4633
+MD5 1e0fe92ccb8d9554797df310e29c0bfa ChangeLog 4784
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 404177e831acfc6ca3f2fa9c7030de7c files/linux26-headers-2.6.7-appCompat.patch 40336
+MD5 8fbf8b2f6ede9687845c0aefb68dc40a files/linux26-headers-2.6.7-appCompat.patch 42076
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 99b00e3c171b..db1ef1466361 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
@@ -1321,3 +1321,57 @@ diff -ur linux-2.6.7/include/linux/sem.h linux-2.6.7-gentoo/include/linux/sem.h
#include <linux/ipc.h>
#include <asm/atomic.h>
+diff -ur linux-2.6.7/include/asm-x86_64/bitops.h linux-2.6.7-gentoo/include/asm-x86_64/bitops.h
+--- linux-2.6.7/include/asm-x86_64/bitops.h 2004-07-10 01:47:34.000000000 +0100
++++ linux-2.6.7-gentoo/include/asm-x86_64/bitops.h 2004-07-28 16:08:37.650740208 +0100
+@@ -475,8 +475,6 @@
+
+ #endif /* __KERNEL__ */
+
+-#ifdef __KERNEL__
+-
+ #define ext2_set_bit(nr,addr) \
+ __test_and_set_bit((nr),(unsigned long*)addr)
+ #define ext2_set_bit_atomic(lock,nr,addr) \
+@@ -504,6 +502,4 @@
+
+ #define ARCH_HAS_ATOMIC_UNSIGNED 1
+
+-#endif /* __KERNEL__ */
+-
+ #endif /* _X86_64_BITOPS_H */
+diff -ur linux-2.6.7/include/asm-ia64/unistd.h linux-2.6.7-gentoo/include/asm-ia64/unistd.h
+--- linux-2.6.7/include/asm-ia64/unistd.h 2004-07-10 01:47:34.000000000 +0100
++++ linux-2.6.7-gentoo/include/asm-ia64/unistd.h 2004-07-28 08:28:20.000000000 +0100
+@@ -121,7 +121,7 @@
+ #define __NR_setdomainname 1129
+ #define __NR_uname 1130
+ #define __NR_adjtimex 1131
+-/* 1132 was __NR_create_module */
++#define __NR_create_module 1132
+ #define __NR_init_module 1133
+ #define __NR_delete_module 1134
+ /* 1135 was __NR_get_kernel_syms */
+diff -ur linux-2.6.7/include/asm-ia64/types.h linux-2.6.7-gentoo/include/asm-ia64/types.h
+--- linux-2.6.7/include/asm-ia64/types.h 2004-07-10 01:47:34.000000000 +0100
++++ linux-2.6.7-gentoo/include/asm-ia64/types.h 2004-07-27 20:13:02.000000000 +0100
+@@ -44,11 +44,6 @@
+ typedef __signed__ long __s64;
+ typedef unsigned long __u64;
+
+-/*
+- * These aren't exported outside the kernel to avoid name space clashes
+- */
+-# ifdef __KERNEL__
+-
+ typedef __s8 s8;
+ typedef __u8 u8;
+
+@@ -69,7 +64,5 @@
+
+ typedef unsigned short kmem_bufctl_t;
+
+-# endif /* __KERNEL__ */
+ #endif /* !__ASSEMBLY__ */
+-
+ #endif /* _ASM_IA64_TYPES_H */