svn commit: r230140 - head/sys/boot/powerpc/ps3

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Jan 15 16:58:44 2012
New Revision: 230140
URL: http://svn.freebsd.org/changeset/base/230140

Log:
  Fix some unreliability problems related to MSR bits inherited from kboot by
  setting an absolute MSR when during on the MMU. This prevents delay(), in
  particular, from intermittently malfunctioning.

Modified:
  head/sys/boot/powerpc/ps3/ps3mmu.c

Modified: head/sys/boot/powerpc/ps3/ps3mmu.c
==============================================================================
--- head/sys/boot/powerpc/ps3/ps3mmu.c	Sun Jan 15 16:57:18 2012	(r230139)
+++ head/sys/boot/powerpc/ps3/ps3mmu.c	Sun Jan 15 16:58:44 2012	(r230140)
@@ -113,7 +113,7 @@ ps3mmu_init(int maxmem)
 	    "r"(1 << SLBV_VSID_SHIFT),
 	    "r"((1 << SLBE_ESID_SHIFT) | SLBE_VALID | 1));
 
-	mtmsr(mfmsr() | PSL_IR | PSL_DR | PSL_RI | PSL_ME);
+	mtmsr(PSL_IR | PSL_DR | PSL_RI | PSL_ME);
 
 	return (0);
 }