Date: Sun, 7 May 2006 22:51:55 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 96801 for review Message-ID: <200605072251.k47Mptae070223@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96801 Change 96801 by jb@jb_freebsd2 on 2006/05/07 22:50:55 Clean up the include files. Move vmem_t out to a compatibility header. Fix a prototype to satisfy gcc's taste for all things consistent. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#7 (text) ==== @@ -45,16 +45,13 @@ * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ -#if defined(sun) #include <sys/dtrace.h> -#else -#include <contrib/opensolaris/uts/common/sys/dtrace.h> +#if !defined(sun) #ifdef __sparcv9 typedef uint32_t pc_t; #else typedef uintptr_t pc_t; #endif -typedef u_int32_t vmem_t; typedef u_int greg_t; #endif @@ -1127,10 +1124,8 @@ uint32_t dts_dblerrors; /* errors in ERROR probes */ uint32_t dts_reserve; /* space reserved for END */ hrtime_t dts_laststatus; /* time of last status */ -#ifdef DOODAD cyclic_id_t dts_cleaner; /* cleaning cyclic */ cyclic_id_t dts_deadman; /* deadman cyclic */ -#endif hrtime_t dts_alive; /* time last alive */ char dts_speculates; /* boolean: has speculations */ char dts_destructive; /* boolean: has dest. actions */ @@ -1246,7 +1241,7 @@ extern int dtrace_getipl(void); extern uintptr_t dtrace_caller(int); extern uint32_t dtrace_cas32(uint32_t *, uint32_t, uint32_t); -extern void *dtrace_casptr(void *, void *, void *); +extern void *dtrace_casptr(volatile void *, volatile void *, volatile void *); extern void dtrace_copyin(uintptr_t, uintptr_t, size_t); extern void dtrace_copyinstr(uintptr_t, uintptr_t, size_t); extern void dtrace_copyout(uintptr_t, uintptr_t, size_t);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605072251.k47Mptae070223>