diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 18:25:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 18:25:29 -0400 |
| commit | 99fdb2fe523480a8748a5af18139bb1f7785c815 (patch) | |
| tree | fbe9d2d5210266544a94ca6b5733c35d8a91d082 | |
| parent | cf380ee7308db0f067ceb2ae8b852838788bf453 (diff) | |
| parent | a2a64769d0d3cc0380b4b6ecdcb781a2f790a69e (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 | |||
| 460 | ;; | 460 | ;; |
| 461 | 461 | ||
| 462 | st8 [r2]=r14 // update current->blocked with new mask | 462 | st8 [r2]=r14 // update current->blocked with new mask |
| 463 | cmpxchg4.acq r14=[r9],r18,ar.ccv // current->thread_info->flags <- r18 | 463 | cmpxchg4.acq r8=[r9],r18,ar.ccv // current->thread_info->flags <- r18 |
| 464 | ;; | 464 | ;; |
| 465 | cmp.ne p6,p0=r17,r14 // update failed? | 465 | cmp.ne p6,p0=r17,r8 // update failed? |
| 466 | (p6) br.cond.spnt.few 1b // yes -> retry | 466 | (p6) br.cond.spnt.few 1b // yes -> retry |
| 467 | 467 | ||
| 468 | #ifdef CONFIG_SMP | 468 | #ifdef CONFIG_SMP |