PERFORCE change 96806 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=96806

Change 96806 by jb at jb_freebsd2 on 2006/05/07 23:12:24

	Satisfy gcc's taste for things consistent.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#3 (text+ko) ====

@@ -182,8 +182,6 @@
 	 */
 	bucket = hashval % dstate->dtds_hashsize;
 
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
 	if (op == DTRACE_DYNVAR_DEALLOC) {
 		volatile uintptr_t *lockp = &hash[bucket].dtdh_lock;
 
@@ -191,14 +189,13 @@
 			while ((lock = *lockp) & 1)
 				continue;
 
-			if (dtrace_casptr((void *)lockp,
-			    (void *)lock, (void *)(lock + 1)) == (void *)lock)
+			if (dtrace_casptr((volatile void *)lockp,
+			    (volatile void *)lock, (volatile void *)(lock + 1)) == (void *)lock)
 				break;
 		}
 
 		dtrace_membar_producer();
 	}
-#endif
 
 top:
 	prev = NULL;