[PATCH][PPC64] Don't clear MSR.RI in do_hash_page_DSI

[Paul Mackerras]

Some code that is used on iSeries (do_hash_page_DSI in head.S) was
clearing the RI (recoverable interrupt) bit in the MSR when it
shouldn't.  We were getting SLB miss interrupts following that which
were panicking because they appeared to have occurred at a bad place.
This patch fixes the problem.

Please apply.

Thanks,
Paul.

diff -puN arch/ppc64/kernel/head.S~ibm-ppc64-hash-page-ri arch/ppc64/kernel/head.S
--- forakpm/arch/ppc64/kernel/head.S~ibm-ppc64-hash-page-ri	2004-05-24 15:14:13.809492931 +1000
+++ forakpm-anton/arch/ppc64/kernel/head.S	2004-05-24 15:14:13.816492844 +1000
@@ -946,7 +946,7 @@ _GLOBAL(do_hash_page_DSI)
 	 */
 	mfmsr	r0
 	li	r4,0
-	ori	r4,r4,MSR_EE+MSR_RI
+	ori	r4,r4,MSR_EE
 	andc	r0,r0,r4
 	mtmsrd	r0			/* Hard Disable, RI off */
 
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/