summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2005-02-13 17:54:55 +0000
committerTim Yamin <plasmaroo@gentoo.org>2005-02-13 17:54:55 +0000
commita98665670e4caa8446266d1bee6228253fc7e6b5 (patch)
tree0d19f46808333a6422af59ced1ec062a5d1b84d9 /sys-kernel
parentApply patch to fix false positives. Bug #81477. (diff)
downloadgentoo-2-a98665670e4caa8446266d1bee6228253fc7e6b5.tar.gz
gentoo-2-a98665670e4caa8446266d1bee6228253fc7e6b5.tar.bz2
gentoo-2-a98665670e4caa8446266d1bee6228253fc7e6b5.zip
Fix sysklogd on IA64.
(Portage version: 2.0.51.16)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/linux-headers/ChangeLog6
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch43
2 files changed, 48 insertions, 1 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 1ad483fa2a00..f894b42d1360 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.100 2005/02/12 21:53:30 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.101 2005/02/13 17:54:55 plasmaroo Exp $
+
+ 13 Feb 2005; <plasmaroo@gentoo.org>
+ files/linux-headers-2.6.8.1-appCompat.patch:
+ Fix sysklogd on IA64.
*linux-headers-2.4.22-r1 (12 Feb 2005)
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
index b1559aeae7db..a020944f7a96 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-appCompat.patch
@@ -1928,3 +1928,46 @@ diff -ur linux-2.6.8.1/include/linux/preempt.h linux-2.6.8.1-gentoo/include/linu
#define BLKPG _IO(0x12,105)
+diff -ur linux-2.6.8.1/include/asm-ia64/signal.h linux-2.6.8.1-gentoo/include/asm-ia64/signal.h
+--- linux-2.6.8.1/include/asm-ia64/signal.h 2004-08-14 11:54:50.000000000 +0100
++++ linux-2.6.8.1-gentoo/include/asm-ia64/signal.h 2005-02-13 17:31:59.000000000 +0000
+@@ -141,16 +141,20 @@
+ # include <linux/types.h>
+
+ /* Avoid too many header ordering problems. */
++#ifndef _SIGNAL_H
+ struct siginfo;
++#endif
+
+ /* Type of a signal handler. */
+ typedef void (*__sighandler_t)(int);
+
++#ifndef _SIGNAL_H
+ typedef struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+ } stack_t;
++#endif
+
+ #ifdef __KERNEL__
+
+diff -ur linux-2.6.8.1/include/asm-ia64/siginfo.h linux-2.6.8.1-gentoo/include/asm-ia64/siginfo.h
+--- linux-2.6.8.1/include/asm-ia64/siginfo.h 2004-08-14 11:56:22.000000000 +0100
++++ linux-2.6.8.1-gentoo/include/asm-ia64/siginfo.h 2005-02-13 17:30:27.000000000 +0000
+@@ -18,6 +18,7 @@
+
+ #include <asm-generic/siginfo.h>
+
++#ifndef _SIGNAL_H
+ typedef struct siginfo {
+ int si_signo;
+ int si_errno;
+@@ -73,6 +74,7 @@
+ } _sigpoll;
+ } _sifields;
+ } siginfo_t;
++#endif
+
+ #define si_imm _sifields._sigfault._imm /* as per UNIX SysV ABI spec */
+ #define si_flags _sifields._sigfault._flags