1 files changed, 7 insertions, 3 deletions

diff --git a/arch/ia64/sn/kernel/xp_nofault.S b/arch/ia64/sn/kernel/xp_nofault.S
index 54e8973b6e99..98e7c7dbfdd8 100644
--- a/arch/ia64/sn/kernel/xp_nofault.S
+++ b/arch/ia64/sn/kernel/xp_nofault.S
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2007 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 
@@ -14,6 +14,11 @@
  * PIO read fails, the MCA handler will force the error to look
  * corrected and vector to the xp_error_PIOR which will return an error.
  *
+ * The definition of "consumption" and the time it takes for an MCA
+ * to surface is processor implementation specific.  This code
+ * is sufficient on Itanium through the Montvale processor family.
+ * It may need to be adjusted for future processor implementations.
+ *
  *      extern int xp_nofault_PIOR(void *remote_register);
  */
 
@@ -22,11 +27,10 @@ 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 consumption
-        or      r9=r9,r9;;              // Or to force consumption
+        srlz.i;;                        // Allow time for MCA to surface
         br.ret.sptk.many b0;;           // Return success
 
         .global xp_error_PIOR
 xp_error_PIOR:
         mov     r8=1                    // Return value of 1
         br.ret.sptk.many b0;;           // Return failure
-