2008-11-04 03:23:17

by Hiroshi Shimamoto

Subject: [PATCH] x86: signal_64: remove unused code in __setup_rt_frame()

From: Hiroshi Shimamoto <[email protected]>

sizeof(*set) is always 8 on x86_64.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
arch/x86/kernel/signal_64.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 83990db..cfbb60a 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -251,11 +251,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
err |= __put_user(fp, &frame->uc.uc_mcontext.fpstate);
- if (sizeof(*set) == 16) {
- __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
- __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
- } else
- err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+ err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));

/* Set up to return from userspace. If provided, use a stub
already in userspace. */
--
1.5.6

2008-11-04 09:01:33

by Ingo Molnar

Subject: Re: [PATCH] x86: signal_64: remove unused code in __setup_rt_frame()

* Hiroshi Shimamoto <[email protected]> wrote:

> From: Hiroshi Shimamoto <[email protected]>
>
> sizeof(*set) is always 8 on x86_64.
>
> Signed-off-by: Hiroshi Shimamoto <[email protected]>
> ---
> arch/x86/kernel/signal_64.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)

applied to tip/x86/signal, thanks!

Ingo