diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-04-19 23:34:45 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-04-19 23:34:45 +0000 |
| commit | a6a8912d951589c5e19060adc7accdb511bdb422 (patch) | |
| tree | 36f9059ac9c3eb89fbd5e8fdcf6746cef7e592c3 /sys-kernel | |
| parent | dev-libs/DirectFB:sysfs - make it local (diff) | |
| download | gentoo-2-a6a8912d951589c5e19060adc7accdb511bdb422.tar.gz gentoo-2-a6a8912d951589c5e19060adc7accdb511bdb422.tar.bz2 gentoo-2-a6a8912d951589c5e19060adc7accdb511bdb422.zip | |
Fix #84353, #89387.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch | 43 |
2 files changed, 46 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index c18bd929ffca..3370b3682001 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.115 2005/04/18 22:00:04 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.116 2005/04/19 23:34:45 plasmaroo Exp $ + + 20 Apr 2005; <plasmaroo@gentoo.org> + files/linux-headers-2.6.11-appCompat.patch: + Fix #84353, #89387. 18 Apr 2005; <plasmaroo@gentoo.org> files/linux-headers-2.6.11-appCompat.patch: diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch index 6db0ceb1c4d7..f500f50f5237 100644 --- a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch +++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch @@ -2232,6 +2232,45 @@ diff -urp linux-2.6.10/include/linux/if_fddi.h linux-2.6.10-gentoo/include/linux /* * Define max and min legal sizes. The frame sizes do not include * 4 byte FCS/CRC (frame check sequence). +diff -urp linux-2.6.11/include/linux/keyboard.h linux-2.6.11-gentoo/include/linux/keyboard.h +--- linux-2.6.11/include/linux/keyboard.h 2004-11-20 16:54:35.000000000 +0000 ++++ linux-2.6.11-gentoo/include/linux/keyboard.h 2005-02-12 19:19:51.244852928 +0000 +@@ -1,6 +1,16 @@ + #ifndef __LINUX_KEYBOARD_H + #define __LINUX_KEYBOARD_H + ++#ifndef __le64 ++#ifdef _LINUX_TYPES_H ++#undef _LINUX_TYPES_H ++#warning Gentoo Linux Headers Warning: GNU Libc Linux Headers Override Detected. ++#warning Gentoo Linux Headers Warning: This is bad. Removing override and continuing. ++#warning Gentoo Linux Headers Warning: If your compilation dies here, mention this when ++#warning Gentoo Linux Headers Warning: filing a bug! ++#include <linux/types.h> ++#endif ++#endif + #include <linux/wait.h> + + #define KG_SHIFT 0 +diff -urp linux-2.6.11/include/asm-parisc/thread_info.h linux-2.6.11-gentoo/include/asm-parisc/thread_info.h +--- linux-2.6.11/include/asm-parisc/thread_info.h 2004-11-20 16:54:35.000000000 +0000 ++++ linux-2.6.11-gentoo/include/asm-parisc/thread_info.h 2005-02-12 19:19:51.244852928 +0000 +@@ -1,8 +1,6 @@ + #ifndef _ASM_PARISC_THREAD_INFO_H + #define _ASM_PARISC_THREAD_INFO_H + +-#ifdef __KERNEL__ +- + #ifndef __ASSEMBLY__ + #include <asm/processor.h> + +@@ -75,6 +73,4 @@ + #define _TIF_USER_WORK_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \ + _TIF_NEED_RESCHED) + +-#endif /* __KERNEL__ */ +- + #endif /* _ASM_PARISC_THREAD_INFO_H */ --- linux-2.6.10/include/asm-sparc/processor.h 2004-12-11 15:49:24.522603912 -0800 +++ linux-2.6.10-gentoo/include/asm-sparc/processor.h 2004-12-11 15:49:18.865463928 -0800 @@ -44,11 +44,13 @@ @@ -2338,8 +2377,8 @@ diff -urp linux-2.6.10/include/linux/if_ppp.h linux-2.6.10-gentoo/include/linux/ /* Constants used for fbio SunOS compatibility */ /* (C) 1996 Miguel de Icaza */ ---- linux-2.6.10/include/linux/byteorder/little_endian.h.orig 2005-03-07 01:19:49.000000000 +0100 -+++ linux-2.6.10/include/linux/byteorder/little_endian.h 2005-03-07 01:20:22.000000000 +0100 +--- linux-2.6.11/include/linux/byteorder/little_endian.h.84353 2005-03-07 01:19:49.000000000 +0100 ++++ linux-2.6.11-gentoo/include/linux/byteorder/little_endian.h 2005-03-07 01:20:22.000000000 +0100 @@ -40,6 +40,7 @@ #define __cpu_to_be16(x) ((__force __be16)__swab16((x))) #define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x)) |