From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Linus Torvalds <torvalds@osdl.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ppc64: Fix 32 bits conversion of SI_TIMER signals
Date: Sun, 26 Sep 2004 16:58:34 +1000 [thread overview]
Message-ID: <1096181913.18234.300.camel@gaston> (raw)
In-Reply-To: <200409260205.i8Q25pGb013827@hera.kernel.org>
On Sun, 2004-09-26 at 11:41, Linux Kernel Mailing List wrote:
> ChangeSet 1.1991, 2004/09/25 18:41:38-07:00, benh@kernel.crashing.org
>
> [PATCH] ppc64: Fix 32 bits conversion of SI_TIMER signals
>
> The current 32 bits translation of the SI_TIMER is wrong on ppc64, causing
> the tst-timer4 testcase of glibc to fail in 32 bits. This patch fixes it.
>
> Signed-off-by: Olaf Hering <olh@suse.de>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>
Agh !
I had two patches, a broken one and a good one and ... of course I sent
the broken one, sorry :(
Can you still back it out ?
Here is the correct one:
ppc64: Fix 32 bits conversion of SI_TIMER signals
The current 32 bits translation of the SI_TIMER is wrong on ppc64, causing
the tst-timer4 testcase of glibc to fail in 32 bits. This patch fixes it.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
===== arch/ppc64/kernel/signal32.c 1.57 vs edited =====
--- 1.57/arch/ppc64/kernel/signal32.c 2004-09-14 10:23:15 +10:00
+++ edited/arch/ppc64/kernel/signal32.c 2004-09-26 16:57:11 +10:00
@@ -472,9 +472,13 @@
&d->si_addr);
break;
case __SI_POLL >> 16:
- case __SI_TIMER >> 16:
err |= __put_user(s->si_band, &d->si_band);
err |= __put_user(s->si_fd, &d->si_fd);
+ break;
+ case __SI_TIMER >> 16:
+ err |= __put_user(s->si_tid, &d->si_tid);
+ err |= __put_user(s->si_overrun, &d->si_overrun);
+ err |= __put_user(s->si_int, &d->si_int);
break;
case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
case __SI_MESGQ >> 16:
===== include/asm-ppc64/ppc32.h 1.16 vs edited =====
--- 1.16/include/asm-ppc64/ppc32.h 2004-09-17 16:58:38 +10:00
+++ edited/include/asm-ppc64/ppc32.h 2004-09-26 09:37:49 +10:00
@@ -32,8 +32,10 @@
/* POSIX.1b timers */
struct {
- unsigned int _timer1;
- unsigned int _timer2;
+ timer_t _tid; /* timer id */
+ int _overrun; /* overrun count */
+ compat_sigval_t _sigval; /* same as below */
+ int _sys_private; /* not to be passed to user */
} _timer;
/* POSIX.1b signals */
next parent reply other threads:[~2004-09-26 7:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200409260205.i8Q25pGb013827@hera.kernel.org>
2004-09-26 6:58 ` Benjamin Herrenschmidt [this message]
2004-09-28 22:22 ` [PATCH] ppc64: Fix 32 bits conversion of SI_TIMER signals David S. Miller
2004-09-28 23:13 ` Benjamin Herrenschmidt
2004-10-03 21:46 ` David S. Miller
2004-09-25 23:46 Benjamin Herrenschmidt
2004-09-26 9:40 ` Olaf Hering
2004-09-26 12:08 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2004-09-25 23:45 Benjamin Herrenschmidt
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=1096181913.18234.300.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.