svn commit: r196946 - projects/ppc64/sys/powerpc/aim64

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Sep  7 19:15:07 2009
New Revision: 196946
URL: http://svn.freebsd.org/changeset/base/196946

Log:
  Fix an inadvertent bug where instead of a literal '1', it was inserting
  bits of the stack pointer into the MSR. This should go to HEAD immediately,
  and to 8.0.

Modified:
  projects/ppc64/sys/powerpc/aim64/mmu_oea64.c

Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Mon Sep  7 19:01:34 2009	(r196945)
+++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Mon Sep  7 19:15:07 2009	(r196946)
@@ -217,7 +217,7 @@ TLBIE(pmap_t pmap, vm_offset_t va) {
 	__asm __volatile("\
 	    mfmsr %0; \
 	    clrldi %1,%0,49; \
-	    insrdi %1,1,1,0; \
+	    insrdi %1,%5,1,0; \
 	    mtmsrd %1; \
 	    ptesync; \
 	    \
@@ -229,7 +229,7 @@ TLBIE(pmap_t pmap, vm_offset_t va) {
 	    eieio; \
 	    tlbsync; \
 	    ptesync;" 
-	: "=r"(msr), "=r"(scratch) : "r"(vpn_hi), "r"(vpn_lo), "r"(32));
+	: "=r"(msr), "=r"(scratch) : "r"(vpn_hi), "r"(vpn_lo), "r"(32), "r"(1));
 #endif
 }