Commit 9c083ebe authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] ppc64: fix 32-bit SI_TIMER conversion fix

Agh !

I had two patches, a broken one and a good one and ... of course I sent
the broken one, sorry :(

This fixes the broken fix.
Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ca844c33
...@@ -478,7 +478,7 @@ static long copy_siginfo_to_user32(compat_siginfo_t __user *d, siginfo_t *s) ...@@ -478,7 +478,7 @@ static long copy_siginfo_to_user32(compat_siginfo_t __user *d, siginfo_t *s)
case __SI_TIMER >> 16: case __SI_TIMER >> 16:
err |= __put_user(s->si_tid, &d->si_tid); err |= __put_user(s->si_tid, &d->si_tid);
err |= __put_user(s->si_overrun, &d->si_overrun); err |= __put_user(s->si_overrun, &d->si_overrun);
err |= __put_user((u32)(u64)s->si_ptr, &d->si_ptr); err |= __put_user(s->si_int, &d->si_int);
break; break;
case __SI_RT >> 16: /* This is not generated by the kernel as of now. */ case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
case __SI_MESGQ >> 16: case __SI_MESGQ >> 16:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment