svn commit: r184457 - in stable/7/sys: . libkern

[Andrew Thompson]

Author: thompsa
Date: Wed Oct 29 21:43:14 2008
New Revision: 184457
URL: http://svn.freebsd.org/changeset/base/184457

Log:
  MFC r183733
  
   Prefix the static shl function with '__' like its parent function __qdivrem to
   avoid being picked up by the DTrace fbt provider.
  
   This is called by __udivdi3() for doing 64bit division on a 32bit arch and may
   be called from within the dtrace context causing a double fault.
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/libkern/qdivrem.c

Modified: stable/7/sys/libkern/qdivrem.c
==============================================================================
--- stable/7/sys/libkern/qdivrem.c	Wed Oct 29 21:31:01 2008	(r184456)
+++ stable/7/sys/libkern/qdivrem.c	Wed Oct 29 21:43:14 2008	(r184457)
@@ -59,7 +59,7 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-shl(register digit *p, register int len, register int sh)
+__shl(register digit *p, register int len, register int sh)
 {
 	register int i;
 
@@ -182,8 +182,8 @@ __qdivrem(uq, vq, arq)
 	for (t = v[1]; t < B / 2; t <<= 1)
 		d++;
 	if (d > 0) {
-		shl(&u[0], m + n, d);		/* u <<= d */
-		shl(&v[1], n - 1, d);		/* v <<= d */
+		__shl(&u[0], m + n, d);		/* u <<= d */
+		__shl(&v[1], n - 1, d);		/* v <<= d */
 	}
 	/*
 	 * D2: j = 0.