diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:04:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:04:02 -0700 |
| commit | b75ae8603568ae18f270213693758c78fb8a29ff (patch) | |
| tree | 15e6c100baadcbce6b7f9f00d50de8c2b7da4c01 /arch/ia64/sn/kernel/xp_nofault.S | |
| parent | 75ca0d22668a36fc83e17407d369b528a22c562c (diff) | |
| parent | 1ee27a4eedf3cc08245d395936c1bfaf80c074cc (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Make SN2 PCI code use ioremap rather than manually mangle the address
[IA64] Force error to surface in nofault code
[IA64] change sh_change_coherence oemcall to use nolock
[IA64] remove duplicate header include line
[IA64] Correct unwind validation code
[IA64] is_power_of_2-ia64/mm/hugetlbpage.c
Diffstat (limited to 'arch/ia64/sn/kernel/xp_nofault.S')
| -rw-r--r-- | arch/ia64/sn/kernel/xp_nofault.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/xp_nofault.S b/arch/ia64/sn/kernel/xp_nofault.S index b772543053c..54e8973b6e9 100644 --- a/arch/ia64/sn/kernel/xp_nofault.S +++ b/arch/ia64/sn/kernel/xp_nofault.S @@ -21,7 +21,8 @@ xp_nofault_PIOR: mov r8=r0 // Stage a success return value ld8.acq r9=[r32];; // PIO Read the specified register - adds r9=1,r9 // Add to force a consume + adds r9=1,r9;; // Add to force consumption + or r9=r9,r9;; // Or to force consumption br.ret.sptk.many b0;; // Return success .global xp_error_PIOR |