svn commit: r183733 - head/sys/libkern

[Andrew Thompson]

Author: thompsa
Date: Thu Oct  9 20:43:42 2008
New Revision: 183733
URL: http://svn.freebsd.org/changeset/base/183733

Log:
  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.

Modified:
  head/sys/libkern/qdivrem.c

Modified: head/sys/libkern/qdivrem.c
==============================================================================
--- head/sys/libkern/qdivrem.c	Thu Oct  9 20:40:11 2008	(r183732)
+++ head/sys/libkern/qdivrem.c	Thu Oct  9 20:43:42 2008	(r183733)
@@ -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.