Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Oct 2006 00:06:09 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 107467 for review
Message-ID:  <200610080006.k98069WJ054809@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107467

Change 107467 by jb@jb_freebsd7 on 2006/10/08 00:05:34

	More updates to match current since perforce missed the integration.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/_types.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/asm.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/bus.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/cache.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/clock.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/elf.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/endian.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/errata.h#2 delete
.. //depot/projects/dtrace/src/sys/sun4v/include/exec.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/float.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/fp.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/frame.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#5 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/instr.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/kdb.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/limits.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/memdev.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/param.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#6 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/proc.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/profile.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/pstate.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ptrace.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/reg.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/reloc.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/resource.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/runq.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/sc_machdep.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/setjmp.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/sf_buf.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/sigframe.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/signal.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/smp.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/stdarg.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/sun4v_cpufunc.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/sysarch.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tick.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tlb.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/trap.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tstate.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/tte_hash.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ucontext.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/upa.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/utrap.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/varargs.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/ver.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/vmparam.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/watch.h#3 edit
.. //depot/projects/dtrace/src/sys/sun4v/include/wstate.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#3 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/_bus.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef SPARC64_INCLUDE__BUS_H
@@ -38,5 +38,6 @@
 typedef int		bus_type_t;
 typedef u_long		bus_addr_t;
 typedef u_long		bus_size_t;
+typedef struct bus_space_tag *bus_space_tag_t;
 
 #endif /* SPARC64_INCLUDE__BUS_H */

==== //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD: src/sys/sparc64/include/_inttypes.h,v 1.2 2002/06/30 05:48:03 mike Exp $
+ * $FreeBSD: src/sys/sun4v/include/_inttypes.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sparc64/include/_limits.h,v 1.14 2005/08/20 16:44:41 stefanf Exp $
+ * $FreeBSD: src/sys/sun4v/include/_limits.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
+ * $FreeBSD: src/sys/sun4v/include/_stdint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/_types.h#3 (text+ko) ====

@@ -29,7 +29,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
+ * $FreeBSD: src/sys/sun4v/include/_types.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/asi.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: asi.h,v 1.3 1997/08/08 14:31:42 torek
- * $FreeBSD: src/sys/sparc64/include/asi.h,v 1.9 2002/07/16 16:22:25 tmm Exp $
+ * $FreeBSD: src/sys/sun4v/include/asi.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ASI_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/asm.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *	from: FreeBSD: src/sys/i386/include/asm.h,v 1.7 2000/01/25
- * $FreeBSD: src/sys/sparc64/include/asm.h,v 1.7 2004/04/07 05:00:00 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/asm.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_ASM_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.19 2004/06/06 21:26:48 phk Exp $
+ * $FreeBSD: src/sys/sun4v/include/asmacros.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#3 (text+ko) ====

@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD: src/sys/sparc64/include/atomic.h,v 1.10 2005/09/27 17:39:11 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/atomic.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/bus.h#4 (text+ko) ====

@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.37 2005/04/18 21:45:34 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/bus.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_BUS_H_
@@ -113,8 +113,6 @@
 /*
  * Access methods for bus resources and address space.
  */
-typedef struct bus_space_tag	*bus_space_tag_t;
-
 struct bus_space_tag {
 	void		*bst_cookie;
 	bus_space_tag_t	bst_parent;

==== //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#3 (text+ko) ====

@@ -33,7 +33,7 @@
  *	form: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/bus_common.h,v 1.5 2005/01/07 02:29:21 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/bus_common.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_BUS_COMMON_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#3 (text+ko) ====

@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD: src/sys/sparc64/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $
+ * $FreeBSD: src/sys/sun4v/include/bus_dma.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _SPARC64_BUS_DMA_H

==== //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#3 (text+ko) ====

@@ -25,7 +25,7 @@
  *
  *	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05
  *
- * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.7 2004/06/28 04:04:43 scottl Exp $
+ * $FreeBSD: src/sys/sun4v/include/bus_private.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_BUS_PRIVATE_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/cache.h#3 (text+ko) ====

@@ -39,7 +39,7 @@
  *	from: @(#)cache.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: cache.h,v 1.3 2000/08/01 00:28:02 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/cache.h,v 1.12 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/cache.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_CACHE_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#3 (text+ko) ====

@@ -21,7 +21,7 @@
  * 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/sparc64/include/ccr.h,v 1.2 2001/12/29 06:50:25 jake Exp $
+ * $FreeBSD: src/sys/sun4v/include/ccr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CCR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/clock.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.6 2002/10/05 20:14:49 mux Exp $
+ * $FreeBSD: src/sys/sun4v/include/clock.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  *	from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
  *	from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.16 2005/12/22 22:16:09 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/cpu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CPU_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.21 2005/07/27 20:01:45 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/cpufunc.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CPUFUNC_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD: src/sys/sparc64/include/db_machdep.h,v 1.9 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/db_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.14 2005/12/07 03:41:12 obrien Exp $
+ * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/endian.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.15 2005/03/02 21:33:28 joerg Exp $
+ * $FreeBSD: src/sys/sun4v/include/endian.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/exec.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/exec.h,v 1.3 2001/08/09 02:09:34 obrien Exp $
+ * $FreeBSD: src/sys/sun4v/include/exec.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/float.h#3 (text+ko) ====

@@ -32,7 +32,7 @@
  *
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp
- * $FreeBSD: src/sys/sparc64/include/float.h,v 1.6 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/float.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/floatingpoint.h,v 1.2 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/floatingpoint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/fp.h#3 (text+ko) ====

@@ -21,7 +21,7 @@
  * 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/sparc64/include/fp.h,v 1.9 2003/04/01 04:02:44 jake Exp $
+ * $FreeBSD: src/sys/sun4v/include/fp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_FP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/frame.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.16 2005/12/22 22:16:09 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/frame.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#3 (text+ko) ====

@@ -21,7 +21,7 @@
  * 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/sparc64/include/fsr.h,v 1.3 2002/09/14 17:58:54 tmm Exp $
+ * $FreeBSD: src/sys/sun4v/include/fsr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_FSR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * (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/sparc64/include/gdb_machdep.h,v 1.3 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/gdb_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#3 (text+ko) ====

@@ -23,31 +23,28 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
  *
+ * $FreeBSD: src/sys/sun4v/include/hv_pcivar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _HV_PCIVAR_H_
 #define _HV_PCIVAR_H_
 
 struct hvpci_softc {
-	devhandle_t	hs_devhandle;
-	phandle_t	hs_node;
-	uint8_t		hs_busnum;
+	devhandle_t		hs_devhandle;
+	phandle_t		hs_node;
+	uint8_t			hs_busnum;
+
+	struct ofw_bus_iinfo	hs_pci_iinfo;
 
 	struct bus_dma_tag	hs_dmatag;
 
-	struct resource	*hs_intr[4];
-	int		hs_intrrefcnt[4];
-
-	struct rman	hs_pci_intr_rman;
-
-	struct rman	hs_pci_mem_rman;
-	bus_space_tag_t	hs_pci_memt;
+	struct rman		hs_pci_mem_rman;
+	bus_space_tag_t		hs_pci_memt;
 	bus_space_handle_t	hs_pci_memh;
 
-	struct rman	hs_pci_io_rman;
-	bus_space_tag_t	hs_pci_iot;
+	struct rman		hs_pci_io_rman;
+	bus_space_tag_t		hs_pci_iot;
 	bus_space_handle_t	hs_pci_ioh;
 };
 

==== //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#3 (text+ko) ====

@@ -1,3 +1,32 @@
+/*-
+ * Copyright 2006 John-Mark Gurney.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * 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/sun4v/include/hviommu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
+ */
+
 #ifndef _HVIOMMU_H_
 #define _HVIOMMU_H_
 

==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#5 (text+ko) ====

@@ -17,6 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ * $FreeBSD: src/sys/sun4v/include/hypervisor_api.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 /*

==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#4 (text+ko) ====

@@ -1,3 +1,30 @@
+/*-
+ * Copyright (c) 2006 Kip Macy
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * 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/sun4v/include/hypervisorvar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
+ */
 
 
 #ifndef	_MACHINE_HYPERVISORVAR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  *	from: NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/idprom.h,v 1.2 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/idprom.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IDPROM_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#3 (text+ko) ====

@@ -32,7 +32,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD: src/sys/sparc64/include/ieee.h,v 1.3 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/ieee.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#3 (text+ko) ====

@@ -1,7 +1,7 @@
 /*-
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
- * $FreeBSD: src/sys/sparc64/include/ieeefp.h,v 1.4 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/ieeefp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#3 (text+ko) ====

@@ -55,7 +55,7 @@
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  *	from: FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06
  *
- * $FreeBSD: src/sys/sparc64/include/in_cksum.h,v 1.3 2006/01/12 11:40:39 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/in_cksum.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/instr.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
  *
- * $FreeBSD: src/sys/sparc64/include/instr.h,v 1.7 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/instr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_INSTR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.14 2005/10/25 19:48:48 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/intr_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#3 (text+ko) ====

@@ -33,7 +33,7 @@
  *	from: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/iommureg.h,v 1.6 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/iommureg.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IOMMUREG_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: iommuvar.h,v 1.9 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/iommuvar.h,v 1.15 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/iommuvar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IOMMUVAR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/kdb.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * (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/sparc64/include/kdb.h,v 1.2 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/kdb.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_KDB_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * 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/sparc64/include/kerneldump.h,v 1.2 2003/04/08 06:35:08 jake Exp $
+ * $FreeBSD: src/sys/sun4v/include/kerneldump.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_KERNELDUMP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD: src/sys/sparc64/include/ktr.h,v 1.6 2005/12/06 16:38:08 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/ktr.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_KTR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/limits.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sparc64/include/limits.h,v 1.12 2005/03/04 21:26:07 joerg Exp $
+ * $FreeBSD: src/sys/sun4v/include/limits.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#3 (text+ko) ====

@@ -21,7 +21,7 @@
  * 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/sparc64/include/lsu.h,v 1.2 2002/07/16 16:24:03 tmm Exp $
+ * $FreeBSD: src/sys/sun4v/include/lsu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_LSU_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.16 2005/01/19 18:24:07 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/md_var.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/memdev.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * (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/sparc64/include/memdev.h,v 1.1 2004/08/01 11:40:54 markm Exp $
+ * $FreeBSD: src/sys/sun4v/include/memdev.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #define CDEV_MAJOR	2

==== //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.5 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/metadata.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#4 (text+ko) ====

@@ -1,3 +1,30 @@
+/*-
+ * Copyright (c) 2006 Kip Macy
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * 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/sun4v/include/mmu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
+ */
 
 
 #ifndef _MACHINE_MMU_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/mutex.h,v 1.5 2001/12/18 00:27:18 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/mutex.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * 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/sparc64/include/nexusvar.h,v 1.3 2004/04/30 19:50:50 tmm Exp $
+ * $FreeBSD: src/sys/sun4v/include/nexusvar.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * 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/sparc64/include/ofw_bus.h,v 1.7 2004/08/16 15:45:27 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/ofw_bus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_OFW_BUS_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * 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/sparc64/include/ofw_machdep.h,v 1.6 2005/02/12 19:13:51 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/ofw_machdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/ofw_mem.h,v 1.3 2003/06/07 18:29:29 jake Exp $
+ * $FreeBSD: src/sys/sun4v/include/ofw_mem.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_MEM_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#3 (text+ko) ====

@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/ofw_upa.h,v 1.5 2005/12/03 19:52:20 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/ofw_nexus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_NEXUS_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#3 (text+ko) ====

@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/include/ofw_upa.h,v 1.5 2005/12/03 19:52:20 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/ofw_upa.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_UPA_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/param.h#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/sparc64/include/param.h,v 1.21 2005/12/06 13:27:21 ru Exp $
+ * $FreeBSD: src/sys/sun4v/include/param.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 /*

==== //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.17 2004/07/10 19:56:00 marcel Exp $
+ * $FreeBSD: src/sys/sun4v/include/pcb.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#6 (text+ko) ====

@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.20 2005/04/16 14:57:38 marius Exp $
+ * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
@@ -77,8 +77,10 @@
 	u_int   pc_kwbuf_full;                                          \
 	struct rwindow pc_tsbwbuf[2];                                   \
         uint64_t pc_caller;                                             \
+        uint32_t pc_tl;                                                 \
+        uint32_t pc_trapid;                                             \
         uint16_t pc_cpulist[MAXCPU];                                    \
-        uint64_t pad[10];
+        uint64_t pad[5];
 
 	/* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick
 	 * succession we _really_ want them to be L1 cache line size aligned

==== //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#3 (text+ko) ====

@@ -33,7 +33,7 @@
  *	from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
- * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.45 2005/12/06 21:09:01 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/pmap.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
@@ -59,6 +59,7 @@
 	TAILQ_HEAD(, pv_entry) pv_list;
 };
 
+
 struct pmap {
 	uint64_t                pm_context;
 	uint64_t                pm_hashscratch;
@@ -116,7 +117,6 @@
 extern	vm_offset_t virtual_end;
 extern	vm_paddr_t msgbuf_phys;
 
-
 static __inline int
 pmap_track_modified(pmap_t pm, vm_offset_t va)
 {

==== //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#3 (text+ko) ====

@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/sparc64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
+ * $FreeBSD: src/sys/sun4v/include/pmc_mdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/proc.h#3 (text+ko) ====

@@ -28,7 +28,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD: src/sys/sparc64/include/proc.h,v 1.14 2005/04/04 21:53:55 jhb Exp $
+ * $FreeBSD: src/sys/sun4v/include/proc.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_

==== //depot/projects/dtrace/src/sys/sun4v/include/profile.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.8 2005/01/07 02:29:22 imp Exp $
+ * $FreeBSD: src/sys/sun4v/include/profile.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610080006.k98069WJ054809>