From 61a2e179a39ee3f6d9bb588f33c4ff9c3a0e58a2 Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Sat, 23 Feb 2008 15:23:58 -0800 Subject: [PATCH] --- yaml --- r: 86233 b: refs/heads/master c: 45d464eb67a1ad03e909ae1868e7ecfcb696c57f h: refs/heads/master i: 86231: 43de4c010d58b66b84449b9ae07381d347311398 v: v3 --- [refs] | 2 +- trunk/arch/h8300/kernel/signal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e08edd57bf77..9baa0ab2d1bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0c1e9073ef7428a14309cba010633a6cd6719ea +refs/heads/master: 45d464eb67a1ad03e909ae1868e7ecfcb696c57f diff --git a/trunk/arch/h8300/kernel/signal.c b/trunk/arch/h8300/kernel/signal.c index 62ea12d339b9..cf3472f7389b 100644 --- a/trunk/arch/h8300/kernel/signal.c +++ b/trunk/arch/h8300/kernel/signal.c @@ -352,7 +352,7 @@ static void setup_frame (int sig, struct k_sigaction *ka, ret = (unsigned char *)(ka->sa.sa_restorer); else { /* sub.l er0,er0; mov.b #__NR_sigreturn,r0l; trapa #0 */ - err != __put_user(0x1a80f800 + (__NR_sigreturn & 0xff), + err |= __put_user(0x1a80f800 + (__NR_sigreturn & 0xff), (unsigned long *)(frame->retcode + 0)); err |= __put_user(0x5700, (unsigned short *)(frame->retcode + 4)); } @@ -428,7 +428,7 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, ret = (unsigned char *)(ka->sa.sa_restorer); else { /* sub.l er0,er0; mov.b #__NR_sigreturn,r0l; trapa #0 */ - err != __put_user(0x1a80f800 + (__NR_sigreturn & 0xff), + err |= __put_user(0x1a80f800 + (__NR_sigreturn & 0xff), (unsigned long *)(frame->retcode + 0)); err |= __put_user(0x5700, (unsigned short *)(frame->retcode + 4)); }