diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-07-18 12:27:51 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-07-18 12:27:51 +0000 |
| commit | ecd825407e51df7584222430b19e016b1e3d22d5 (patch) | |
| tree | 514d0a8f978d55742a28c8c11e141bbeab3cabc0 /sys-kernel/linux26-headers | |
| parent | Added to ~ppc (Manifest recommit) (Manifest recommit) (diff) | |
| download | gentoo-2-ecd825407e51df7584222430b19e016b1e3d22d5.tar.gz gentoo-2-ecd825407e51df7584222430b19e016b1e3d22d5.tar.bz2 gentoo-2-ecd825407e51df7584222430b19e016b1e3d22d5.zip | |
Compile fixes for LVM2 and raidtools - bugs #57096 and #57373.
Diffstat (limited to 'sys-kernel/linux26-headers')
| -rw-r--r-- | sys-kernel/linux26-headers/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch | 43 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/metadata.xml | 3 |
3 files changed, 50 insertions, 4 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index dc4c8b703ff7..7a2415be4d2e 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.8 2004/07/17 21:05:31 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.9 2004/07/18 12:27:51 plasmaroo Exp $ + + 18 Jul 2004; <plasmaroo@gentoo.org> + files/linux26-headers-2.6.7-appCompat.patch: + Compile fixes for LVM2 and raidtools which include their own copies of + <linux/list.h> without checking for the kernel version being included. Bug + #57096 and #57373. *linux26-headers-2.6.7-r3 (15 Jul 2004) 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 e52dc0d8e548..0f11b442304e 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 @@ -1245,3 +1245,46 @@ diff -ur linux-2.6.7/include/linux/prefetch.h linux-2.6.7-gentoo/include/linux/p prefetch(cp); #endif } +diff -ur linux-2.6.7/include/linux/list.h linux-2.6.7-gentoo/include/linux/list.h +--- linux-2.6.7/include/linux/list.h 2004-07-18 13:09:36.330803152 +0100 ++++ linux-2.6.7-gentoo/include/linux/list.h 2004-07-18 12:48:14.700640552 +0100 +@@ -36,6 +36,8 @@ + (ptr)->next = (ptr); (ptr)->prev = (ptr); \ + } while (0) + ++#ifdef __KERNEL__ ++ + /* + * Insert a new entry between two known consecutive entries. + * +@@ -678,3 +680,4 @@ + pos = n) + + #endif ++#endif +diff -ur linux-2.6.7/include/asm-i386/processor.h linux-2.6.7-gentoo/include/asm-i386/processor.h +--- linux-2.6.7/include/asm-i386/processor.h 2004-07-18 13:09:36.191824280 +0100 ++++ linux-2.6.7-gentoo/include/asm-i386/processor.h 2004-07-18 13:14:01.627471928 +0100 +@@ -403,8 +403,10 @@ + /* + * .. and then another 0x100 bytes for emergency kernel stack + */ +- unsigned long stack[64]; +-} __attribute__((packed)); ++ #ifndef stack /* LVM2-Userspace defines this as a function... */ ++ unsigned long stack[64]; ++ #endif ++} __attribute__((packed)); + + #define ARCH_MIN_TASKALIGN 16 + +@@ -491,7 +493,9 @@ + extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); + + extern unsigned long thread_saved_pc(struct task_struct *tsk); ++#ifdef __KERNEL__ + void show_trace(struct task_struct *task, unsigned long *stack); ++#endif + + unsigned long get_wchan(struct task_struct *p); + diff --git a/sys-kernel/linux26-headers/metadata.xml b/sys-kernel/linux26-headers/metadata.xml index 0a79a3da756e..354fe7cf5de1 100644 --- a/sys-kernel/linux26-headers/metadata.xml +++ b/sys-kernel/linux26-headers/metadata.xml @@ -5,7 +5,4 @@ <maintainer> <email>plasmaroo@gentoo.org</email> </maintainer> -<maintainer> - <email>x86-kernel@gentoo.org</email> -</maintainer> </pkgmetadata> |