summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/signal_64.c
diff options
context:
space:
mode:
authorHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>2008-09-13 02:02:53 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-14 15:35:51 +0200
commit2ba48e16e78216bb5b9fd08a088bfefda478df25 (patch)
treeb6c3c5b9fa9f7b0a2f7998c2439569ff40bbfd5d /arch/x86/kernel/signal_64.c
parentx86: signal: put give_sigsegv of setup frames together (diff)
downloadlinux-2ba48e16e78216bb5b9fd08a088bfefda478df25.tar.xz
linux-2ba48e16e78216bb5b9fd08a088bfefda478df25.zip
x86: signal: remove unneeded err handling
This patch eliminates unused or unneeded variable handling. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/signal_64.c')
-rw-r--r--arch/x86/kernel/signal_64.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 3b79e179ba3a..a21c85197295 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
if (save_i387_xstate(fp) < 0)
- err |= -1;
+ return -EFAULT;
} else
frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
return -EFAULT;
if (ka->sa.sa_flags & SA_SIGINFO) {
- err |= copy_siginfo_to_user(&frame->info, info);
- if (err)
+ if (copy_siginfo_to_user(&frame->info, info))
return -EFAULT;
}