 @@ -30,27 +30,26 @@
 #include <sys/param.h>
 #include <sys/objfs.h>
 #if !defined(sun)
 #include <sys/bitmap.h>
 #include <sys/utsname.h>
 #include <sys/ioccom.h>
 #include <sys/time.h>
 #include <string.h>
 #endif
 #include <setjmp.h>
 #include <libctf.h>
 #include <dtrace.h>
 #include <gelf.h>
 #include <synch.h>
 #ifdef	__cplusplus
 extern "C" {
 #endif
 #include <dt_parser.h>
 #include <dt_regset.h>
 #include <dt_inttab.h>
 #include <dt_strtab.h>
 #include <dt_ident.h>
 #include <dt_list.h>
 #include <dt_decl.h>
 #include <dt_as.h>
 @@ -590,26 +589,39 @@ extern int dt_gmatch(const char *, const
 extern char *dt_basename(char *);
 extern ulong_t dt_popc(ulong_t);
 extern ulong_t dt_popcb(const ulong_t *, ulong_t);
 extern int dt_buffered_enable(dtrace_hdl_t *);
 extern int dt_buffered_flush(dtrace_hdl_t *, dtrace_probedata_t *,
     const dtrace_recdesc_t *, const dtrace_aggdata_t *, uint32_t flags);
 extern void dt_buffered_disable(dtrace_hdl_t *);
 extern void dt_buffered_destroy(dtrace_hdl_t *);
 extern uint64_t dt_stddev(uint64_t *, uint64_t);
 #define	DT_MUTEX_HELD(x)	dt_mutex_held(x)
 static inline int
 dt_mutex_held(pthread_mutex_t *lock)
+{
 #if defined(sun)
 	extern int _mutex_held(struct _lwp_mutex *);
 	return (_mutex_held((struct _lwp_mutex *)lock));
 #else
 	return (1);
 #endif
+}
 extern int dt_options_load(dtrace_hdl_t *);
 extern void dt_dprintf(const char *, ...);
 extern void dt_setcontext(dtrace_hdl_t *, dtrace_probedesc_t *);
 extern void dt_endcontext(dtrace_hdl_t *);
 extern void dt_pragma(dt_node_t *);
 extern int dt_reduce(dtrace_hdl_t *, dt_version_t);
 extern void dt_cg(dt_pcb_t *, dt_node_t *);
 extern dtrace_difo_t *dt_as(dt_pcb_t *);
 extern void dt_dis(const dtrace_difo_t *, FILE *);

 @@ -13,26 +13,30 @@
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
  * CDDL HEADER END
  */
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #ifndef ELFSIZE
 #define ELFSIZE ARCH_ELFSIZE
 #endif
 #include <sys/types.h>
 #if defined(sun)
 #include <sys/modctl.h>
 #include <sys/kobj.h>
 #include <sys/kobj_impl.h>
 #include <sys/sysmacros.h>
 #include <sys/elf.h>
 #include <sys/task.h>
 #else
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 @@ -69,27 +73,27 @@ dt_module_symhash_insert(dt_module_t *dm
 	dsp->ds_symid = id;
 	h = dt_strtab_hash(name, NULL) % dmp->dm_nsymbuckets;
 	dsp->ds_next = dmp->dm_symbuckets[h];
 	dmp->dm_symbuckets[h] = dmp->dm_symfree++;
+}
 static uint_t
 dt_module_syminit32(dt_module_t *dmp)
+{
 #if STT_NUM != (STT_TLS + 1)
 #error "STT_NUM has grown. update dt_module_syminit32()"
 #endif
-	const Elf32_Sym *sym = dmp->dm_symtab.cts_data;
+	Elf32_Sym *sym = dmp->dm_symtab.cts_data;
 	const char *base = dmp->dm_strtab.cts_data;
 	size_t ss_size = dmp->dm_strtab.cts_size;
 	uint_t i, n = dmp->dm_nsymelems;
 	uint_t asrsv = 0;
 	for (i = 0; i < n; i++, sym++) {
 		const char *name = base + sym->st_name;
 		uchar_t type = ELF32_ST_TYPE(sym->st_info);
 		if (type >= STT_NUM || type == STT_SECTION)
 			continue; /* skip sections and unknown types */
 		if (sym->st_name == 0 || sym->st_name >= ss_size)
 @@ -106,27 +110,27 @@ dt_module_syminit32(dt_module_t *dmp)
 		dt_module_symhash_insert(dmp, name, i);
+	}
 	return (asrsv);
+}
 static uint_t
 dt_module_syminit64(dt_module_t *dmp)
+{
 #if STT_NUM != (STT_TLS + 1)
 #error "STT_NUM has grown. update dt_module_syminit64()"
 #endif
-	const Elf64_Sym *sym = dmp->dm_symtab.cts_data;
+	Elf64_Sym *sym = dmp->dm_symtab.cts_data;
 	const char *base = dmp->dm_strtab.cts_data;
 	size_t ss_size = dmp->dm_strtab.cts_size;
 	uint_t i, n = dmp->dm_nsymelems;
 	uint_t asrsv = 0;
 	for (i = 0; i < n; i++, sym++) {
 		const char *name = base + sym->st_name;
 		uchar_t type = ELF64_ST_TYPE(sym->st_info);
 		if (type >= STT_NUM || type == STT_SECTION)
 			continue; /* skip sections and unknown types */
 		if (sym->st_name == 0 || sym->st_name >= ss_size)
 @@ -484,27 +488,27 @@ dt_module_lookup_by_ctf(dtrace_hdl_t *dt
+{
 	return (ctfp ? ctf_getspecific(ctfp) : NULL);
+}
 static int
 dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
+{
 	const char *s;
 	size_t shstrs;
 	GElf_Shdr sh;
 	Elf_Data *dp;
 	Elf_Scn *sp;
-	if (elf_getshdrstrndx(dmp->dm_elf, &shstrs) == -1)
+	if (elf_getshstrndx(dmp->dm_elf, &shstrs) == 0)
 		return (dt_set_errno(dtp, EDT_NOTLOADED));
 	for (sp = NULL; (sp = elf_nextscn(dmp->dm_elf, sp)) != NULL; ) {
 		if (gelf_getshdr(sp, &sh) == NULL || sh.sh_type == SHT_NULL ||
 		    (s = elf_strptr(dmp->dm_elf, shstrs, sh.sh_name)) == NULL)
 			continue; /* skip any malformed sections */
 		if (sh.sh_type == ctsp->cts_type &&
 		    sh.sh_entsize == ctsp->cts_entsize &&
 		    strcmp(s, ctsp->cts_name) == 0)
 			break; /* section matches specification */
+	}
 @@ -890,27 +894,27 @@ dt_module_update(dtrace_hdl_t *dtp, cons
+	}
 	/*
 	 * Since the module can unload out from under us (and /system/object
 	 * will return ENOENT), tell libelf to cook the entire file now and
 	 * then close the underlying file descriptor immediately.  If this
 	 * succeeds, we know that we can continue safely using dmp->dm_elf.
 	 */
 	dmp->dm_elf = elf_begin(fd, ELF_C_READ, NULL);
 	err = elf_cntl(dmp->dm_elf, ELF_C_FDREAD);
 	(void) close(fd);
 	if (dmp->dm_elf == NULL || err == -1 ||
-	    elf_getshdrstrndx(dmp->dm_elf, &shstrs) == -1) {
+	    elf_getshstrndx(dmp->dm_elf, &shstrs) == 0) {
 		dt_dprintf("failed to load %s: %s\n",
 		    fname, elf_errmsg(elf_errno()));
 		dt_module_destroy(dtp, dmp);
 		return;
+	}
 	switch (gelf_getclass(dmp->dm_elf)) {
 	case ELFCLASS32:
 		dmp->dm_ops = &dt_modops_32;
 		bits = 32;
 		break;
 	case ELFCLASS64:
 		dmp->dm_ops = &dt_modops_64;

 @@ -173,125 +173,125 @@ proc_continue(struct proc_handle *phdl)
+}
 #define	IS_SYS_EXEC(w)	(w == SYS_exec || w == SYS_execve)
 #define	IS_SYS_FORK(w)	(w == SYS_vfork || w == SYS_fork1 ||	\
 			w == SYS_forkall || w == SYS_forksys)
 #ifdef DOODAD
 static dt_bkpt_t *
 dt_proc_bpcreate(dt_proc_t *dpr, uintptr_t addr, dt_bkpt_f *func, void *data)
+{
 	struct ps_prochandle *P = dpr->dpr_proc;
 	dt_bkpt_t *dbp;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	if ((dbp = dt_zalloc(dpr->dpr_hdl, sizeof (dt_bkpt_t))) != NULL) {
 		dbp->dbp_func = func;
 		dbp->dbp_data = data;
 		dbp->dbp_addr = addr;
 		if (Psetbkpt(P, dbp->dbp_addr, &dbp->dbp_instr) == 0)
 			dbp->dbp_active = B_TRUE;
 		dt_list_append(&dpr->dpr_bps, dbp);
+	}
 	return (dbp);
+}
 #endif
 static void
 dt_proc_bpdestroy(dt_proc_t *dpr, int delbkpts)
+{
 #if defined(sun)
 	int state = Pstate(dpr->dpr_proc);
 #else
 	int state = proc_state(dpr->dpr_proc);
 #endif
 	dt_bkpt_t *dbp, *nbp;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = nbp) {
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #ifdef DOODAD
 		if (delbkpts && dbp->dbp_active &&
 		    state != PS_LOST && state != PS_UNDEAD) {
 			(void) Pdelbkpt(dpr->dpr_proc,
 			    dbp->dbp_addr, dbp->dbp_instr);
+		}
 #endif
 		nbp = dt_list_next(dbp);
 		dt_list_delete(&dpr->dpr_bps, dbp);
 		dt_free(dpr->dpr_hdl, dbp);
+	}
+}
 #ifdef DOODAD
 static void
 dt_proc_bpmatch(dtrace_hdl_t *dtp, dt_proc_t *dpr)
+{
 	const lwpstatus_t *psp = &Pstatus(dpr->dpr_proc)->pr_lwp;
 	dt_bkpt_t *dbp;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	for (dbp = dt_list_next(&dpr->dpr_bps);
 	    dbp != NULL; dbp = dt_list_next(dbp)) {
 		if (psp->pr_reg[R_PC] == dbp->dbp_addr)
 			break;
+	}
 	if (dbp == NULL) {
 		dt_dprintf("pid %d: spurious breakpoint wakeup for %lx\n",
 		    (int)dpr->dpr_pid, (ulong_t)psp->pr_reg[R_PC]);
 		return;
+	}
 	dt_dprintf("pid %d: hit breakpoint at %lx (%lu)\n",
 	    (int)dpr->dpr_pid, (ulong_t)dbp->dbp_addr, ++dbp->dbp_hits);
 	dbp->dbp_func(dtp, dpr, dbp->dbp_data);
 	(void) Pxecbkpt(dpr->dpr_proc, dbp->dbp_instr);
+}
 #endif
 static void
 dt_proc_bpenable(dt_proc_t *dpr)
+{
 	dt_bkpt_t *dbp;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	for (dbp = dt_list_next(&dpr->dpr_bps);
 	    dbp != NULL; dbp = dt_list_next(dbp)) {
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #ifdef DOODAD
 		if (!dbp->dbp_active && Psetbkpt(dpr->dpr_proc,
 		    dbp->dbp_addr, &dbp->dbp_instr) == 0)
 			dbp->dbp_active = B_TRUE;
 #endif
+	}
 	dt_dprintf("breakpoints enabled\n");
+}
 static void
 dt_proc_bpdisable(dt_proc_t *dpr)
+{
 	dt_bkpt_t *dbp;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	for (dbp = dt_list_next(&dpr->dpr_bps);
 	    dbp != NULL; dbp = dt_list_next(dbp)) {
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #ifdef DOODAD
 		if (dbp->dbp_active && Pdelbkpt(dpr->dpr_proc,
 		    dbp->dbp_addr, dbp->dbp_instr) == 0)
 			dbp->dbp_active = B_FALSE;
 #endif
+	}
 	dt_dprintf("breakpoints disabled\n");
+}
 @@ -322,27 +322,27 @@ dt_proc_notify(dtrace_hdl_t *dtp, dt_pro
 		(void) pthread_mutex_unlock(&dph->dph_lock);
+	}
+}
 /*
  * Check to see if the control thread was requested to stop when the victim
  * process reached a particular event (why) rather than continuing the victim.
  * If 'why' is set in the stop mask, we wait on dpr_cv for dt_proc_continue().
  * If 'why' is not set, this function returns immediately and does nothing.
  */
 static void
 dt_proc_stop(dt_proc_t *dpr, uint8_t why)
+{
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	assert(why != DT_PROC_STOP_IDLE);
 	if (dpr->dpr_stop & why) {
 		dpr->dpr_stop |= DT_PROC_STOP_IDLE;
 		dpr->dpr_stop &= ~why;
 		(void) pthread_cond_broadcast(&dpr->dpr_cv);
 		/*
 		 * We disable breakpoints while stopped to preserve the
 		 * integrity of the program text for both our own disassembly
 		 * and that of the kernel.
 		 */
 @@ -424,27 +424,27 @@ dt_proc_rdwatch(dt_proc_t *dpr, rd_event
+}
 /*
  * Common code for enabling events associated with the run-time linker after
  * attaching to a process or after a victim process completes an exec(2).
  */
 static void
 dt_proc_attach(dt_proc_t *dpr, int exec)
+{
 	const pstatus_t *psp = Pstatus(dpr->dpr_proc);
 	rd_err_e err;
 	GElf_Sym sym;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	if (exec) {
 		if (psp->pr_lwp.pr_errno != 0)
 			return; /* exec failed: nothing needs to be done */
 		dt_proc_bpdestroy(dpr, B_FALSE);
 		Preset_maps(dpr->dpr_proc);
+	}
 	if ((dpr->dpr_rtld = Prd_agent(dpr->dpr_proc)) != NULL &&
 	    (err = rd_event_enable(dpr->dpr_rtld, B_TRUE)) == RD_OK) {
 		dt_proc_rdwatch(dpr, RD_PREINIT, "RD_PREINIT");
 		dt_proc_rdwatch(dpr, RD_POSTINIT, "RD_POSTINIT");
 @@ -490,27 +490,27 @@ dt_proc_attach(dt_proc_t *dpr, int exec)
 static void
 dt_proc_waitrun(dt_proc_t *dpr)
+{
 	struct ps_prochandle *P = dpr->dpr_proc;
 	const lwpstatus_t *psp = &Pstatus(P)->pr_lwp;
 	int krflag = psp->pr_flags & (PR_KLC | PR_RLC);
 	timestruc_t tstamp = psp->pr_tstamp;
 	lwpid_t lwpid = psp->pr_lwpid;
 	const long wstop = PCWSTOP;
 	int pfd = Pctlfd(P);
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 	assert(psp->pr_flags & PR_STOPPED);
 	assert(Pstate(P) == PS_STOP);
 	/*
 	 * While we are waiting for the victim to run, clear PR_KLC and PR_RLC
 	 * so that if the libdtrace client is killed, the victim stays stopped.
 	 * dt_proc_destroy() will also observe this and perform PRELEASE_HANG.
 	 */
 	(void) Punsetflags(P, krflag);
 	Psync(P);
 	(void) pthread_mutex_unlock(&dpr->dpr_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpuvar.h,v 1.4 2010/02/28 14:45:47 haad Exp $	*/
+/*	$NetBSD: cpuvar.h,v 1.5 2010/03/01 11:19:39 darran Exp $	*/
 /*
  * CDDL HEADER START
+ *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
+ *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
+ *
 @@ -20,26 +20,27 @@
+ *
  * CDDL HEADER END
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #ifndef _COMPAT_OPENSOLARIS_SYS_CPUVAR_H
 #define	_COMPAT_OPENSOLARIS_SYS_CPUVAR_H
 #include <sys/mutex.h>
 #include <sys/cpuvar_defs.h>
 #ifdef _KERNEL
 #define	CPU_CACHE_COHERENCE_SIZE	64
 /*
  * The cpu_core structure consists of per-CPU state available in any context.
  * On some architectures, this may mean that the page(s) containing the
  * NCPU-sized array of cpu_core structures must be locked in the TLB -- it
  * is up to the platform to assure that this is performed properly.  Note that
  * the structure is sized to avoid false sharing.
  */
 #define	CPUC_SIZE		(sizeof (uint16_t) + sizeof (uintptr_t) + \
 				sizeof (kmutex_t))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: elf.h,v 1.4 2010/02/28 14:45:47 haad Exp $	*/
+/*	$NetBSD: elf.h,v 1.5 2010/03/01 11:19:40 darran Exp $	*/
 /*
  * CDDL HEADER START
+ *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
+ *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
+ *
 @@ -19,100 +19,25 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
  * CDDL HEADER END
+ *
  * $FreeBSD: src/sys/compat/opensolaris/sys/elf.h,v 1.1 2007/11/28 21:50:40 jb Exp $
+ *
  * ELF compatibility definitions for OpenSolaris source.
+ *
  */
 #ifndef	_SYS__ELF_SOLARIS_H_
 #define	_SYS__ELF_SOLARIS_H_
-#include_next <sys/elf.h>
+#if HAVE_NBTOOL_CONFIG_H
 #include <nbinclude/sys/exec_elf.h>
 #define __sElfN(x)       typedef __CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x) x
 __sElfN(Addr);
 __sElfN(Cap);
 __sElfN(Dyn);
 __sElfN(Ehdr);
 __sElfN(Move);
 __sElfN(Off);
 __sElfN(Phdr);
 __sElfN(Rel);
 __sElfN(Rela);
 __sElfN(Shdr);
 __sElfN(Sym);
 __sElfN(Syminfo);
 __sElfN(Verdaux);
 __sElfN(Verdef);
 __sElfN(Vernaux);
 __sElfN(Verneed);
 __sElfN(Versym);
 __sElfN(Half);
 __sElfN(Sword);
 __sElfN(Word);
 #if __ELF_WORD_SIZE == 32
 typedef	Elf32_Word	Xword;	/* Xword/Sxword are 32-bits in Elf32 */
 typedef	Elf32_Sword	Sxword;
 #else
-typedef	Elf64_Xword	Xword;
+#include <sys/exec_elf.h>
 typedef	Elf64_Sxword	Sxword;
 #endif
-#define ELF_M_INFO	__ELFN(M_INFO)
+#define	SHT_SUNW_dof		0x6ffffff4
-#define ELF_M_SIZE	__ELFN(M_SIZE)
+#define	EM_AMD64		EM_X86_64
 #define ELF_M_SYM	__ELFN(M_SYM)
-/*
+#define __ELF_WORD_SIZE ELFSIZE
  * Elf `printf' type-cast macros.  These force arguments to be a fixed size
  * so that Elf32 and Elf64 can share common format strings.
  */
 #define	EC_ADDR(a)	((Elf64_Addr)(a))		/* "ull" */
 #define	EC_OFF(a)	((Elf64_Off)(a))		/* "ull"  */
 #define	EC_HALF(a)	((Elf64_Half)(a))		/* "d"   */
 #define	EC_WORD(a)	((Elf64_Word)(a))		/* "u"   */
 #define	EC_SWORD(a)	((Elf64_Sword)(a))		/* "d"   */
 #define	EC_XWORD(a)	((Elf64_Xword)(a))		/* "ull" */
 #define	EC_SXWORD(a)	((Elf64_Sxword)(a))		/* "ll"  */
 #define	EC_LWORD(a)	((Elf64_Lword)(a))		/* "ull" */
 #define	elf_checksum		__elfN(checksum)
 #define	elf_fsize		__elfN(fsize)
 #define	elf_getehdr		__elfN(getehdr)
 #define	elf_getphdr		__elfN(getphdr)
 #define	elf_newehdr		__elfN(newehdr)
 #define	elf_newphdr		__elfN(newphdr)
 #define	elf_getshdr		__elfN(getshdr)
 #define	elf_xlatetof		__elfN(xlatetof)
 #define	elf_xlatetom		__elfN(xlatetom)
 #define	Elf_cap_entry		__ElfN(cap_entry)
 #define	Elf_cap_title		__ElfN(cap_title)
 #define	Elf_demangle_name	__ElfN(demangle_name)
 #define	Elf_dyn_entry		__ElfN(dyn_entry)
 #define	Elf_dyn_title		__ElfN(dyn_title)
 #define	Elf_ehdr		__ElfN(ehdr)
 #define	Elf_got_entry		__ElfN(got_entry)
 #define	Elf_got_title		__ElfN(got_title)
 #define	Elf_reloc_apply_reg	__ElfN(reloc_apply_reg)
 #define	Elf_reloc_apply_val	__ElfN(reloc_apply_val)
 #define	Elf_reloc_entry_1	__ElfN(reloc_entry_1)
 #define	Elf_reloc_entry_2	__ElfN(reloc_entry_2)
 #define	Elf_reloc_title		__ElfN(reloc_title)
 #define	Elf_phdr		__ElfN(phdr)
 #define	Elf_shdr		__ElfN(shdr)
 #define	Elf_syms_table_entry	__ElfN(syms_table_entry)
 #define	Elf_syms_table_title	__ElfN(syms_table_title)
 #define	Elf_ver_def_title	__ElfN(ver_def_title)
 #define	Elf_ver_line_1		__ElfN(ver_line_1)
 #define	Elf_ver_line_2		__ElfN(ver_line_2)
 #define	Elf_ver_line_3		__ElfN(ver_line_3)
 #define	Elf_ver_line_4		__ElfN(ver_line_4)
 #define	Elf_ver_line_5		__ElfN(ver_line_5)
 #define	Elf_ver_need_title	__ElfN(ver_need_title)
 #endif /* !_SYS__ELF_SOLARIS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: policy.h,v 1.4 2010/02/28 14:45:47 haad Exp $	*/
+/*	$NetBSD: policy.h,v 1.5 2010/03/01 11:19:40 darran Exp $	*/
 /*-
  * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,35 +25,37 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  $ $FreeBSD: src/sys/compat/opensolaris/sys/policy.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 #ifndef _OPENSOLARIS_SYS_POLICY_H_
 #define	_OPENSOLARIS_SYS_POLICY_H_
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/vnode.h>
 struct mount;
 struct ucred;
 struct vattr;
 struct vnode;
 int	secpolicy_zfs(struct kauth_cred  *cred);
 int	secpolicy_sys_config(struct kauth_cred  *cred, int checkonly);
 int	secpolicy_zinject(struct kauth_cred  *cred);
-int 	secpolicy_fs_mount(struct kauth_cred *cred, vnode_t *mvp, struct mount *vfsp);
+int 	secpolicy_fs_mount(struct kauth_cred *cred, struct vnode *mvp, struct mount *vfsp);
 int	secpolicy_fs_unmount(struct kauth_cred  *cred, struct mount *vfsp);
 int	secpolicy_basic_link(struct kauth_cred  *cred);
 int	secpolicy_vnode_stky_modify(struct kauth_cred *cred);
 int 	secpolicy_vnode_owner(cred_t *cred, uid_t owner);
 int	secpolicy_vnode_remove(struct kauth_cred *cred);
 int	secpolicy_vnode_access(struct kauth_cred *cred, struct vnode *vp,
 	    uint64_t owner, int mode);
 int 	secpolicy_vnode_chown(struct kauth_cred *cred,
             boolean_t check_self);
 int	secpolicy_vnode_setdac(struct kauth_cred *cred, uid_t owner);
 int	secpolicy_vnode_setattr(struct kauth_cred *cred, struct vnode *vp,
 	    struct vattr *vap, const struct vattr *ovap, int flags,
 	    int unlocked_access(void *, int, struct kauth_cred *), void *node);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sdt.h,v 1.3 2010/02/21 01:46:36 darran Exp $	*/
+/*	$NetBSD: sdt.h,v 1.4 2010/03/01 11:19:40 darran Exp $	*/
 /*-
  * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,47 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * $FreeBSD: src/sys/compat/opensolaris/sys/sdt.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 #ifndef _OPENSOLARIS_SYS_SDT_H_
 #define	_OPENSOLARIS_SYS_SDT_H_
 #include_next <sys/sdt.h>
 #include <sys/dtrace.h>
 typedef struct {
     char			name[SDT_MAX_NAME_SIZE];
     dtrace_provider_id_t	id;
     dtrace_pattr_t 		attr;
     sdt_probe_t			*probes[];
 } sdt_provider_t;
 int sdt_register(sdt_provider_t *);
 int sdt_unregister(sdt_provider_t *);
 #undef	DTRACE_PROBE
 #undef	DTRACE_PROBE1
 #undef	DTRACE_PROBE2
 #undef	DTRACE_PROBE3
 #undef	DTRACE_PROBE4
 #undef	DTRACE_PROBE5
 #undef	DTRACE_PROBE6
 #undef	DTRACE_PROBE7
 #define	DTRACE_PROBE(name)
 #define	DTRACE_PROBE1(name, type1, arg1)
 #define	DTRACE_PROBE2(name, type1, arg1, type2, arg2)
 #define	DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3)
 #define	DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4)
 #define	DTRACE_PROBE5(name, type1, arg1, type2, arg2, type3, arg3, \
 	type4, arg4, type5, arg5)
 #define	DTRACE_PROBE6(name, type1, arg1, type2, arg2, type3, arg3, \
 	type4, arg4, type5, arg5, type6, arg6)
 #define	DTRACE_PROBE7(name, type1, arg1, type2, arg2, type3, arg3, \
 	type4, arg4, type5, arg5, type6, arg6, type7, arg7)
 #endif	/* _OPENSOLARIS_SYS_SDT_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: types.h,v 1.6 2010/02/28 14:45:47 haad Exp $	*/
+/*	$NetBSD: types.h,v 1.7 2010/03/01 11:19:40 darran Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -115,26 +115,27 @@ typedef struct kauth_cred cred_t;
 typedef uintptr_t	pc_t;
 typedef struct vm_page	page_t;
 typedef	ushort_t	o_mode_t;	/* old file attribute type */
 typedef	u_longlong_t	diskaddr_t;
 typedef void		*zone_t;
 typedef struct vfsops	vfsops_t;
 #ifdef _KERNEL
 typedef	short		index_t;
 typedef	off_t		offset_t;
 typedef	long		ptrdiff_t;	/* pointer difference */
 typedef	int64_t		rlim64_t;
 typedef __caddr_t	caddr_t;	/* core address */
 #else
 typedef	longlong_t	offset_t;
 typedef	u_longlong_t	u_offset_t;
 typedef	uint64_t	upad64_t;
 typedef	struct timespec	timespec_t;
 typedef	int32_t		daddr32_t;
 typedef	int32_t		time32_t;
 #endif	/* !_KERNEL */
 #define	MAXOFFSET_T 	0x7fffffffffffffffLL

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.123 2009/09/16 16:34:56 dyoung Exp $
+#	$NetBSD: Makefile,v 1.124 2010/03/01 11:19:41 darran Exp $
 .include <bsd.sys.mk>
 INCSDIR= /usr/include/sys
 INCS=	acct.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h audioio.h \
 	bitops.h bootblock.h bswap.h buf.h \
 	callback.h callout.h cdefs.h cdefs_aout.h \
 	cdefs_elf.h cdio.h chio.h clockctl.h condvar.h conf.h core.h \
 	cpuio.h \
 	device.h device_if.h \
 	dir.h dirent.h \
 	disk.h disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
 @@ -19,28 +19,28 @@ INCS=	acct.h agpio.h aio.h ansi.h aout_m
 	float_ieee754.h fstypes.h gcq.h gmon.h gpio.h hash.h \
 	ieee754.h inttypes.h ioccom.h ioctl.h ioctl_compat.h iostat.h ipc.h \
 	joystick.h \
 	kcore.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
 	localedef.h lock.h lockf.h lwp.h lwpctl.h \
 	malloc.h mallocvar.h mbuf.h md4.h md5.h midiio.h \
 	mman.h module.h mount.h mqueue.h msg.h msgbuf.h mtio.h mutex.h \
 	namei.h null.h \
 	param.h pipe.h pmc.h poll.h pool.h power.h proc.h \
 	protosw.h pset.h ptrace.h ptree.h \
 	queue.h \
 	ras.h rb.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
 	rnd.h rwlock.h sa.h satypes.h \
-	scanio.h sched.h scsiio.h select.h selinfo.h sem.h sha1.h sha2.h \
+	scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \
-	shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \
+	sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \
 	sleepq.h socket.h \
 	socketvar.h sockio.h specificdata.h stat.h statvfs.h \
 	syscall.h syscallargs.h sysctl.h stdint.h swap.h \
 	syncobj.h syslimits.h syslog.h \
 	tape.h termios.h time.h timeb.h timepps.h times.h \
 	timex.h trace.h tree.h tty.h ttychars.h ttycom.h \
 	ttydefaults.h ttydev.h types.h \
 	ucontext.h ucred.h uio.h un.h unistd.h unpcb.h user.h utsname.h uuid.h \
 	vadvise.h verified_exec.h videoio.h vmmeter.h vnode.h vnode_if.h \
 	wait.h wapbl.h wapbl_replay.h wdog.h
 INCSYMLINKS=\
 	sys/exec_elf.h /usr/include/elf.h \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec_elf.h,v 1.100 2009/12/20 05:50:20 thorpej Exp $	*/
+/*	$NetBSD: exec_elf.h,v 1.101 2010/03/01 11:19:41 darran Exp $	*/
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -480,27 +480,29 @@ typedef struct {
 #define	STB_NUM			3
 #define	STB_LOOS		10	/* Operating system specific range */
 #define	STB_HIOS		12
 #define	STB_LOPROC		13	/* Processor-specific range */
 #define	STB_HIPROC		15
 /* st_info: Symbol Types */
 #define	STT_NOTYPE		0	/* Type not specified */
 #define	STT_OBJECT		1	/* Associated with a data object */
 #define	STT_FUNC		2	/* Associated with a function */
 #define	STT_SECTION		3	/* Associated with a section */
 #define	STT_FILE		4	/* Associated with a file name */
-#define	STT_NUM			5
+#define STT_COMMON		5	/* Uninitialised common block */
 #define STT_TLS			6	/* Thread local data object */
 #define	STT_NUM			7
 #define	STT_LOOS		10	/* Operating system specific range */
 #define	STT_HIOS		12
 #define	STT_LOPROC		13	/* Processor-specific range */
 #define	STT_HIPROC		15
 /* st_other: Visibility Types */
 #define	STV_DEFAULT		0	/* use binding type */
 #define	STV_INTERNAL		1	/* not referenced from outside */
 #define	STV_HIDDEN		2	/* not visible, may be used via ptr */
 #define	STV_PROTECTED		3	/* visible, not preemptible */
 #define	STV_EXPORTED		4
 #define	STV_SINGLETON		5

 @@ -684,27 +684,27 @@ dt_pid_usdt_mapping(void *data, const pr
 	printf("XXX %s not implemented\n", __func__);
 	return ENODEV;
 #endif
+}
 static int
 dt_pid_create_usdt_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp,
     dt_pcb_t *pcb, dt_proc_t *dpr)
+{
 #if 0	/* XXX TBD needs libproc */
 	struct ps_prochandle *P = dpr->dpr_proc;
 	int ret = 0;
-	assert(MUTEX_HELD(&dpr->dpr_lock));
+	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
 #ifdef DOODAD
 	(void) Pupdate_maps(P);
 	if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) {
 		ret = -1;
 		(void) dt_pid_error(dtp, pcb, dpr, NULL, D_PROC_USDT,
 		    "failed to instantiate probes for pid %d: %s",
 #if defined(sun)
 		    (int)Pstatus(P)->pr_pid, strerror(errno));
 #else
 		    (int)proc_getpid(P), strerror(errno));
 #endif
+	}