From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Roman Zippel <zippel@linux-m68k.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: missing bit from signal patches
Date: Thu, 30 May 2002 23:26:36 +1000 [thread overview]
Message-ID: <20020530232636.09d7b7eb.sfr@canb.auug.org.au> (raw)
In-Reply-To: <Pine.LNX.4.21.0205301442410.17583-100000@serv>
Hi Roman,
On Thu, 30 May 2002 14:46:20 +0200 (CEST) Roman Zippel <zippel@linux-m68k.org> wrote:
>
> On Thu, 30 May 2002, Stephen Rothwell wrote:
>
> > Is the following a more ugly hack than yours?
>
> Yes. :)
> The problem is copy_siginfo(), which wants to access struct siginfo.
> Copy the m68k version of siginfo.h and try to compile that.
OK, sorry, brain fart :-)
It seems that is an architecture defines its own siginfo_t then it must
also define its own copy_siginfo function (for now anyway).
Try this ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff -ruN 2.5.19/include/asm-alpha/siginfo.h 2.5.19-si.4/include/asm-alpha/siginfo.h
--- 2.5.19/include/asm-alpha/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-alpha/siginfo.h Thu May 30 23:11:50 2002
@@ -6,6 +6,7 @@
#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4)
#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
#include <asm-generic/siginfo.h>
diff -ruN 2.5.19/include/asm-cris/siginfo.h 2.5.19-si.4/include/asm-cris/siginfo.h
--- 2.5.19/include/asm-cris/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-cris/siginfo.h Thu May 30 23:11:50 2002
@@ -1,6 +1,8 @@
#ifndef _CRIS_SIGINFO_H
#define _CRIS_SIGINFO_H
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
+
#include <asm-generic/siginfo.h>
#endif
diff -ruN 2.5.19/include/asm-ia64/siginfo.h 2.5.19-si.4/include/asm-ia64/siginfo.h
--- 2.5.19/include/asm-ia64/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-ia64/siginfo.h Thu May 30 23:11:50 2002
@@ -13,6 +13,7 @@
#define HAVE_ARCH_SIGINFO_T
#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
#include <asm-generic/siginfo.h>
diff -ruN 2.5.19/include/asm-m68k/siginfo.h 2.5.19-si.4/include/asm-m68k/siginfo.h
--- 2.5.19/include/asm-m68k/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-m68k/siginfo.h Thu May 30 23:17:10 2002
@@ -2,6 +2,7 @@
#define _M68K_SIGINFO_H
#define HAVE_ARCH_SIGINFO_T
+#define HAVE_ARCH_COPY_SIGINFO
#include <asm-generic/siginfo.h>
@@ -68,6 +69,18 @@
#define si_uid16 _sifields._kill._uid
#else
#define si_uid _sifields._kill._uid
+
+#include <linux/string.h>
+
+static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
+{
+ if (from->si_code < 0)
+ memcpy(to, from, sizeof(*to));
+ else
+ /* _sigchld is currently the largest know union member */
+ memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
+}
+
#endif /* __KERNEL__ */
#endif
diff -ruN 2.5.19/include/asm-mips/siginfo.h 2.5.19-si.4/include/asm-mips/siginfo.h
--- 2.5.19/include/asm-mips/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-mips/siginfo.h Thu May 30 23:18:46 2002
@@ -12,8 +12,8 @@
#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4)
#define HAVE_ARCH_SIGINFO_T
-
#define HAVE_ARCH_SIGEVENT_T
+#define HAVE_ARCH_COPY_SIGINFO
#include <asm-generic/siginfo.h>
@@ -121,5 +121,20 @@
} _sigev_thread;
} _sigev_un;
} sigevent_t;
+
+#ifdef __KERNEL__
+
+#include <linux/string.h>
+
+static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
+{
+ if (from->si_code < 0)
+ memcpy(to, from, sizeof(*to));
+ else
+ /* _sigchld is currently the largest know union member */
+ memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
+}
+
+#endif
#endif /* _ASM_SIGINFO_H */
diff -ruN 2.5.19/include/asm-mips64/siginfo.h 2.5.19-si.4/include/asm-mips64/siginfo.h
--- 2.5.19/include/asm-mips64/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-mips64/siginfo.h Thu May 30 23:19:33 2002
@@ -13,6 +13,8 @@
#define HAVE_ARCH_SIGINFO_T
#define HAVE_ARCH_SIGEVENT_T
+#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
#include <asm-generic/siginfo.h>
@@ -120,5 +122,20 @@
} _sigev_thread;
} _sigev_un;
} sigevent_t;
+
+#ifdef __KERNEL__
+
+#include <linux/string.h>
+
+static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
+{
+ if (from->si_code < 0)
+ memcpy(to, from, sizeof(*to));
+ else
+ /* _sigchld is currently the largest know union member */
+ memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
+}
+
+#endif
#endif /* _ASM_SIGINFO_H */
diff -ruN 2.5.19/include/asm-parisc/siginfo.h 2.5.19-si.4/include/asm-parisc/siginfo.h
--- 2.5.19/include/asm-parisc/siginfo.h Thu May 30 09:44:38 2002
+++ 2.5.19-si.4/include/asm-parisc/siginfo.h Thu May 30 23:11:50 2002
@@ -1,6 +1,8 @@
#ifndef _PARISC_SIGINFO_H
#define _PARISC_SIGINFO_H
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
+
#include <asm-generic/siginfo.h>
/*
diff -ruN 2.5.19/include/asm-sparc/siginfo.h 2.5.19-si.4/include/asm-sparc/siginfo.h
--- 2.5.19/include/asm-sparc/siginfo.h Thu May 30 09:44:39 2002
+++ 2.5.19-si.4/include/asm-sparc/siginfo.h Thu May 30 23:11:50 2002
@@ -7,6 +7,7 @@
#define HAVE_ARCH_SIGINFO_T
#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
#include <asm-generic/siginfo.h>
diff -ruN 2.5.19/include/asm-sparc64/siginfo.h 2.5.19-si.4/include/asm-sparc64/siginfo.h
--- 2.5.19/include/asm-sparc64/siginfo.h Thu May 30 09:44:39 2002
+++ 2.5.19-si.4/include/asm-sparc64/siginfo.h Thu May 30 23:11:50 2002
@@ -10,6 +10,7 @@
#define HAVE_ARCH_SIGINFO_T
#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
#include <asm-generic/siginfo.h>
next prev parent reply other threads:[~2002-05-30 13:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-05-30 0:18 [PATCH] " Stephen Rothwell
2002-05-30 8:04 ` Roman Zippel
2002-05-30 12:08 ` Stephen Rothwell
2002-05-30 12:46 ` Roman Zippel
2002-05-30 13:26 ` Stephen Rothwell [this message]
2002-05-30 14:16 ` Peter Wächtler
2002-05-30 19:57 ` Roman Zippel
2002-05-31 0:24 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020530232636.09d7b7eb.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®