diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-26 14:26:14 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-26 14:26:14 +1100 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/h8300/kernel/signal.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/h8300/kernel/signal.c')
| -rw-r--r-- | arch/h8300/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index 62ea12d339b..cf3472f7389 100644 --- a/arch/h8300/kernel/signal.c +++ b/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)); } |