Commit:     c034637967881830979b5415e55578e42f806659
Parent:     eaf6c766446c0faa326b339900f975e6f1f62b01
Author:     Russ Anderson <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 14 16:01:24 2007 -0500
Committer:  Tony Luck <[EMAIL PROTECTED]>
CommitDate: Tue Jun 26 13:34:16 2007 -0700

    [IA64] Force error to surface in nofault code
    Montecito behaves slightly differently than previous processors,
    resulting in the MCA due to a failed PIO read to sometimes surfacing
    outside the nofault code.  Adding an additional or and stop bits
    ensures the MCA surfaces in the nofault code.
    Signed-off-by: Russ Anderson <[EMAIL PROTECTED]>
    Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
 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 b772543..54e8973 100644
--- a/arch/ia64/sn/kernel/xp_nofault.S
+++ b/arch/ia64/sn/kernel/xp_nofault.S
@@ -21,7 +21,8 @@
        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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to