]> err.no Git - linux-2.6/commitdiff
h8300: signal.c typo fix
authorYoshinori Sato <ysato@users.sourceforge.jp>
Sat, 23 Feb 2008 23:23:58 +0000 (15:23 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 24 Feb 2008 01:12:15 +0000 (17:12 -0800)
typo fix.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/h8300/kernel/signal.c

index 62ea12d339b9275c154a30b0e55451f16b7f640c..cf3472f7389b9467bdb483ac883e81d4414a0532 100644 (file)
@@ -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));
        }