diff options
| author |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 15:25:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 15:25:29 -0700 |
| commit | 99fdb2fe523480a8748a5af18139bb1f7785c815 (patch) | |
| tree | fbe9d2d5210266544a94ca6b5733c35d8a91d082 | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | [IA64] Fix race condition in the rt_sigprocmask fastcall (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
| -rw-r--r-- | arch/ia64/kernel/fsys.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index 4f3cdef75797..962b6c4e32b5 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S @@ -460,9 +460,9 @@ EX(.fail_efault, ld8 r14=[r33]) // r14 <- *set ;; st8 [r2]=r14 // update current->blocked with new mask - cmpxchg4.acq r14=[r9],r18,ar.ccv // current->thread_info->flags <- r18 + cmpxchg4.acq r8=[r9],r18,ar.ccv // current->thread_info->flags <- r18 ;; - cmp.ne p6,p0=r17,r14 // update failed? + cmp.ne p6,p0=r17,r8 // update failed? (p6) br.cond.spnt.few 1b // yes -> retry #ifdef CONFIG_SMP |