svn commit: r197091 - projects/ppc64/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Sep 11 15:35:28 2009
New Revision: 197091
URL: http://svn.freebsd.org/changeset/base/197091

Log:
  Fix 64-bit copyin/out() routines to use constants instead of magic numbers
  when setting SLB entries.

Modified:
  projects/ppc64/sys/powerpc/aim/copyinout.c

Modified: projects/ppc64/sys/powerpc/aim/copyinout.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Sep 11 15:31:13 2009	(r197090)
+++ projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Sep 11 15:35:28 2009	(r197091)
@@ -87,8 +87,8 @@ set_user_sr(pmap_t pm, const void *addr)
 	vsid = va_to_vsid(pm, (vm_offset_t)addr);
 	PMAP_UNLOCK(pm);
 
-	slb1 = vsid << 12;
-	slb2 = (((esid << 1) | 1UL) << 27) | USER_SR;
+	slb1 = vsid << SLBV_VSID_SHIFT;
+	slb2 = (esid << SLBE_ESID_SHIFT) | SLBE_VALID | USER_SR;
 
 	__asm __volatile ("slbie %0; slbmte %1, %2" :: "r"(esid << 28),
 	    "r"(slb1), "r"(slb2));