PERFORCE change 127627 for review

Marko Zec zec at FreeBSD.org
Wed Oct 17 05:05:59 PDT 2007


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

Change 127627 by zec at zec_tpx32 on 2007/10/17 12:05:35

	IFC @ 127623

Affected files ...

.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#8 integrate
.. //depot/projects/vimage/src/sys/arm/arm/support.S#3 integrate
.. //depot/projects/vimage/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/asm.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/vimage/src/sys/conf/files#20 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#7 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#7 integrate
.. //depot/projects/vimage/src/sys/conf/newvers.sh#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/vimage/src/sys/ddb/db_ps.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/cm/smc90cx6.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/idt/idt_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipwreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi_cam.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#4 integrate
.. //depot/projects/vimage/src/sys/dev/puc/puc_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_init.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_intr.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_io.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_misc.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_share.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_share.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union.h#4 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#7 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC.hints#5 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate
.. //depot/projects/vimage/src/sys/ia64/disasm/disasm.h#2 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/db_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/exception.S#6 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_switch.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/p1003_1b.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/subr_param.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#6 integrate
.. //depot/projects/vimage/src/sys/libkern/arm/ffs.S#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#13 integrate
.. //depot/projects/vimage/src/sys/net/bpf.c#13 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.c#10 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.h#7 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#3 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/accf_data.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/accf_http.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/in_cksum.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/in_gif.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/in_proto.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_divert.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_ecn.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_encap.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#27 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_id.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#9 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_options.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#18 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#15 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#16 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_var.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_debug.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#20 integrate
.. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs.h#3 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#8 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#7 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#5 integrate
.. //depot/projects/vimage/src/sys/pc98/cbus/sio.c#4 integrate
.. //depot/projects/vimage/src/sys/pci/if_vr.c#5 integrate
.. //depot/projects/vimage/src/sys/pci/if_wb.c#3 integrate
.. //depot/projects/vimage/src/sys/pci/if_xl.c#5 integrate
.. //depot/projects/vimage/src/sys/pci/intpm.c#6 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#5 integrate
.. //depot/projects/vimage/src/sys/sys/ata.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/mbuf.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#12 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/systm.h#8 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/uma_core.c#7 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#11 integrate
.. //depot/projects/vimage/src/sys/vm/vm_param.h#3 integrate

Differences ...

==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC.hints#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.18 2007/10/15 20:00:20 netchild Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"

==== //depot/projects/vimage/src/sys/arm/arm/bcopy_page.S#2 (text+ko) ====

@@ -40,11 +40,11 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.4 2005/10/06 11:26:37 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.5 2007/10/13 12:05:03 cognet Exp $");
 
 #include "assym.s"
 
-#ifndef __XSCALE__
+#ifndef _ARM_ARCH_5E
 
 /* #define BIG_LOOPS */
 
@@ -179,10 +179,10 @@
 
 	ldmfd	sp!, {r4-r8, pc}
 
-#else	/* __XSCALE__ */
+#else	/* _ARM_ARCH_5E */
 
 /*
- * XSCALE version of bcopy_page
+ * armv5e version of bcopy_page
  */
 ENTRY(bcopy_page)
 	pld	[r0]
@@ -248,7 +248,7 @@
 	RET
 
 /*
- * XSCALE version of bzero_page
+ * armv5e version of bzero_page
  */
 ENTRY(bzero_page)
 	mov	r1, #PAGE_SIZE
@@ -273,4 +273,4 @@
 	subs	r1, r1, #128
 	bne	1b
 	RET
-#endif	/* __XSCALE__ */
+#endif	/* _ARM_ARCH_5E */

==== //depot/projects/vimage/src/sys/arm/arm/bcopyinout.S#2 (text+ko) ====

@@ -45,8 +45,8 @@
 .L_min_memcpy_size:
 	.word	_C_LABEL(_min_memcpy_size)
 
-__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.8 2005/10/23 23:09:14 cognet Exp $");
-#ifdef __XSCALE__
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.9 2007/10/13 12:05:03 cognet Exp $");
+#ifdef _ARM_ARCH_5E
 #include <arm/arm/bcopyinout_xscale.S>
 #else
 
@@ -64,7 +64,7 @@
 #define SAVE_REGS	stmfd	sp!, {r4-r11}
 #define RESTORE_REGS	ldmfd	sp!, {r4-r11}
 		
-#if defined(__XSCALE__)
+#if defined(_ARM_ARCH_5E)
 #define HELLOCPP #
 #define PREFETCH(rx,o)	pld	[ rx , HELLOCPP (o) ]
 #else

==== //depot/projects/vimage/src/sys/arm/arm/in_cksum_arm.S#2 (text+ko) ====

@@ -37,14 +37,14 @@
  */
 
 /*
- * Hand-optimised in_cksum() and in4_cksum() implementations for ARM/Xscale
+ * Hand-optimised in_cksum() and in4_cksum() implementations for ARM/armv5e
  */
 
 #include "opt_inet.h"
 
 #include <machine/asm.h>
 #include "assym.s"
-__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.6 2005/10/03 14:07:09 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.7 2007/10/13 12:05:03 cognet Exp $");
 
 /*
  * int in_cksum(struct mbuf *m, int len)
@@ -113,7 +113,7 @@
  */
 /* LINTSTUB: Ignore */
 ASENTRY_NP(L_cksumdata)
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	pld	[r0]			/* Pre-fetch the start of the buffer */
 #endif
 	mov	r2, #0
@@ -147,7 +147,7 @@
 
 	/* Buffer is now word aligned */
 .Lcksumdata_wordaligned:
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	cmp	r1, #0x04		/* Less than 4 bytes left? */
 	blt	.Lcksumdata_endgame	/* Yup */
 
@@ -202,7 +202,7 @@
 	adcs	r2, r2, r7
 	adc	r2, r2, #0x00
 
-#else	/* !__XSCALE__ */
+#else	/* !_ARM_ARCH_5E */
 
 	subs	r1, r1, #0x40
 	blt	.Lcksumdata_bigloop_end
@@ -238,7 +238,7 @@
 	RETeq
 	cmp	r1, #0x20
 
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	ldrged	r4, [r0], #0x08		/* Avoid stalling pld and result */
 	blt	.Lcksumdata_less_than_32
 	pld	[r0, #0x18]
@@ -280,7 +280,7 @@
 	nop
 
 /*
- * Note: We use ldm here, even on Xscale, since the combined issue/result
+ * Note: We use ldm here, even on armv5e, since the combined issue/result
  * latencies for ldm and ldrd are the same. Using ldm avoids needless #ifdefs.
  */
 	/* At least 24 bytes remaining... */

==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#8 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -4114,9 +4114,23 @@
 void
 pmap_zero_page_xscale(vm_paddr_t phys, int off, int size)
 {
+#ifdef ARM_USE_SMALL_ALLOC
+	char *dstpg;
+#endif
+
 	if (_arm_bzero && size >= _min_bzero_size &&
 	    _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0)
 		return;
+#ifdef ARM_USE_SMALL_ALLOC
+	dstpg = (char *)arm_ptovirt(phys);
+	if (off || size != PAGE_SIZE) {
+		bzero(dstpg + off, size);
+		cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size);
+	} else {
+		bzero_page((vm_offset_t)dstpg);
+		cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
+	}
+#else
 	mtx_lock(&cmtx);
 	/*
 	 * Hook in the page, zero it, and purge the cache for that
@@ -4134,6 +4148,7 @@
 		bzero_page(cdstp);
 	mtx_unlock(&cmtx);
 	xscale_cache_clean_minidata();
+#endif
 }
 
 /*

==== //depot/projects/vimage/src/sys/arm/arm/support.S#3 (text+ko) ====

@@ -26,7 +26,7 @@
 
 #include <machine/asm.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.12 2007/02/26 02:03:48 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.13 2007/10/13 12:05:03 cognet Exp $");
 
 #include "assym.s"
 
@@ -86,13 +86,13 @@
 	/* We are now word aligned */
 .Lmemset_wordaligned:
 	orr	r3, r3, r3, lsl #8	/* Extend value to 16-bits */
-#ifdef __XSCALE__
-	tst	ip, #0x04		/* Quad-align for Xscale */
+#ifdef _ARM_ARCH_5E
+	tst	ip, #0x04		/* Quad-align for armv5e */
 #else
 	cmp	r1, #0x10
 #endif
 	orr	r3, r3, r3, lsl #16	/* Extend value to 32-bits */
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	subne	r1, r1, #0x04		/* Quad-align if necessary */
 	strne	r3, [ip], #0x04
 	cmp	r1, #0x10
@@ -105,7 +105,7 @@
 	/* Do 128 bytes at a time */
 .Lmemset_loop128:
 	subs	r1, r1, #0x80
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	strged	r2, [ip], #0x08
 	strged	r2, [ip], #0x08
 	strged	r2, [ip], #0x08
@@ -148,7 +148,7 @@
 	/* Do 32 bytes at a time */
 .Lmemset_loop32:
 	subs	r1, r1, #0x20
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	strged	r2, [ip], #0x08
 	strged	r2, [ip], #0x08
 	strged	r2, [ip], #0x08
@@ -165,7 +165,7 @@
 	adds	r1, r1, #0x10		/* Partially adjust for extra sub */
 
 	/* Deal with 16 bytes or more */
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	strged	r2, [ip], #0x08
 	strged	r2, [ip], #0x08
 #else
@@ -183,7 +183,7 @@
 	bgt	.Lmemset_loop4
 	RETeq			/* Zero length so just exit */
 
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
 	/* Compensate for 64-bit alignment check */
 	adds	r1, r1, #0x04
 	RETeq
@@ -868,7 +868,7 @@
 	add	r1, r1, #1
 	b	.Lmemmove_bl4
 
-#if !defined(__XSCALE__)
+#if !defined(_ARM_ARCH_5E)
 ENTRY(memcpy)
 	/* save leaf functions having to store this away */
 	/* Do not check arm_memcpy if we're running from flash */
@@ -2870,7 +2870,7 @@
 	strh	r2, [r0, #0x09]
 	strb	r1, [r0, #0x0b]
 	RET
-#endif /* __XSCALE__ */
+#endif /* _ARM_ARCH_5E */
 
 #ifdef GPROF
 

==== //depot/projects/vimage/src/sys/arm/arm/swtch.S#3 (text+ko) ====

@@ -83,7 +83,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $");
 
 
 /*
@@ -187,7 +187,7 @@
 	ldr	pc, [r9, #CF_CONTEXT_SWITCH]
 
 	/* Restore all the save registers */
-#ifndef __XSCALE__
+#ifndef _ARM_ARCH_5E
 	add	r1, r7, #PCB_R8
 	ldmia	r1, {r8-r13}
 #else
@@ -249,7 +249,7 @@
 	mov	r4, r0 /* Save the old thread. */
 
 	/* Save all the registers in the old thread's pcb */
-#ifndef __XSCALE__
+#ifndef _ARM_ARCH_5E
 	add	r7, r2, #(PCB_R8)
 	stmia	r7, {r8-r13}
 #else
@@ -419,7 +419,7 @@
 
         msr	cpsr_c, r3		/* Restore the old mode */
 	/* Restore all the save registers */
-#ifndef __XSCALE__
+#ifndef _ARM_ARCH_5E
 	add	r7, r9, #PCB_R8
 	ldmia	r7, {r8-r13}
 	sub	r7, r7, #PCB_R8		/* restore PCB pointer */

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

@@ -33,7 +33,7 @@
  *
  *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
  *
- * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.7 2007/10/13 12:04:10 cognet Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
@@ -137,10 +137,15 @@
 
 #if defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5__) || \
     defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || \
-    defined (__ARM_ARCH_5TEJ__)
+    defined (__ARM_ARCH_5TEJ__) || defined (__ARM_ARCH_5E__)
 #define _ARM_ARCH_5
 #endif
 
+#if defined (_ARM_ARCH_6) || defined(__ARM_ARCH_5TE__) || \
+    defined(__ARM_ARCH_5TEJ__) || defined(__ARM_ARCH_5E__)
+#define _ARM_ARCH_5E
+#endif
+
 #if defined (_ARM_ARCH_5) || defined (__ARM_ARCH_4T__)
 #define _ARM_ARCH_4T
 #endif

==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 (text+ko) ====

@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.2 2007/02/25 22:17:54 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.3 2007/10/12 06:03:42 kevlo Exp $");
 
 /*
  * Intel XScale Queue Manager support.
@@ -341,7 +341,7 @@
 	 */
 	sc->aqmFreeSramAddress += (qi->qSizeInWords * sizeof(uint32_t));
 
-	/* Set the interupt source if this queue is in the range 0-31 */
+	/* Set the interrupt source if this queue is in the range 0-31 */
 	if (qId < IX_QMGR_MIN_QUEUPP_QID)
 	    aqm_srcsel_write(sc, qId, srcSel);
 
@@ -604,7 +604,7 @@
 	/* Calculate the checkMask and checkValue for this q */
 	aqm_calc_statuscheck(sc, qId, srcSel);
 #endif
-	/* Set the interupt source if this queue is in the range 0-31 */
+	/* Set the interrupt source if this queue is in the range 0-31 */
 	if (qId < IX_QMGR_MIN_QUEUPP_QID)
 	    aqm_srcsel_write(sc, qId, srcSel);
 

==== //depot/projects/vimage/src/sys/boot/ficl/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44 2006/09/28 10:02:03 ru Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.45 2007/10/15 14:20:24 nyan Exp $
 #
 .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
@@ -18,7 +18,7 @@
 CFLAGS+=	-msoft-float
 .endif
 .if ${MACHINE} == "pc98"
-CFLAGS+=	-DPC98
+CFLAGS+=	-Os -DPC98
 .endif
 .if HAVE_PNP
 CFLAGS+=	-DHAVE_PNP

==== //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.42 2006/04/11 20:11:30 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.43 2007/10/12 17:09:43 ps Exp $
 #
 LIB=			i386
 INTERNALLIB=
@@ -10,6 +10,13 @@
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
 	smbios.c time.c vidconsole.c amd64_tramp.S
 
+# Enable PXE TFTP or NFS support, not both.
+.if defined(LOADER_TFTP_SUPPORT)
+CFLAGS+=	-DLOADER_TFTP_SUPPORT
+.else
+CFLAGS+=	-DLOADER_NFS_SUPPORT
+.endif
+
 BOOT_COMCONSOLE_PORT?= 0x3f8
 CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}
 

==== //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.22 2005/04/17 21:38:22 wollman Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $");
 
 #include <stand.h>
 #include <string.h>
@@ -335,8 +335,10 @@
     if (pxe_opens > 0)
 	return(0);
 
+#ifdef LOADER_NFS_SUPPORT
     /* get an NFS filehandle for our root filesystem */
     pxe_setnfshandle(rootpath);
+#endif
 
     if (pxe_sock >= 0) {
 

==== //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#2 (text+ko) ====

@@ -1,12 +1,13 @@
 # Common defines for all of /sys/boot/pc98/
 #
-# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.6 2005/09/13 08:27:38 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.7 2007/10/15 14:20:24 nyan Exp $
 
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x100000
 CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
-		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
+		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+		-Os
 LDFLAGS+=	-nostdlib
 
 # BTX components

==== //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#3 (text+ko) ====

@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian at tfs.com) Sept 1992
  *
- * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28 2006/12/04 23:04:13 mjacob Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.29 2007/10/12 22:11:22 scottl Exp $
  */
 
 /*
@@ -170,8 +170,11 @@
 #define	SMS_PAGE_CODE 			0x3F
 #define SMS_VENDOR_SPECIFIC_PAGE	0x00
 #define SMS_DISCONNECT_RECONNECT_PAGE	0x02
+#define SMS_CACHE_PAGE			0x08
 #define SMS_PERIPHERAL_DEVICE_PAGE	0x09
 #define SMS_CONTROL_MODE_PAGE		0x0A
+#define SMS_PROTO_SPECIFIC_PAGE		0x19
+#define SMS_INFO_EXCEPTIONS_PAGE	0x1C
 #define SMS_ALL_PAGES_PAGE		0x3F
 #define	SMS_PAGE_CTRL_MASK		0xC0
 #define	SMS_PAGE_CTRL_CURRENT 		0x00
@@ -257,6 +260,8 @@
 #define	SLS_ERROR_VERIFY_PAGE		0x05
 #define	SLS_ERROR_NONMEDIUM_PAGE	0x06
 #define	SLS_ERROR_LASTN_PAGE		0x07
+#define SLS_SELF_TEST_PAGE		0x10
+#define SLS_IE_PAGE			0x2f
 #define	SLS_PAGE_CTRL_MASK		0xC0
 #define	SLS_PAGE_CTRL_THRESHOLD		0x00
 #define	SLS_PAGE_CTRL_CUMULATIVE	0x40
@@ -329,6 +334,55 @@
 	u_int8_t aen_holdoff_period[2];
 };
 
+struct scsi_cache_page {
+	u_int8_t page_code;
+#define SCHP_PAGE_SAVABLE		0x80	/* Page is savable */
+	u_int8_t page_length;
+	u_int8_t cache_flags;
+#define SCHP_FLAGS_WCE			0x04	/* Write Cache Enable */
+#define SCHP_FLAGS_MF			0x02	/* Multiplication factor */
+#define SCHP_FLAGS_RCD			0x01	/* Read Cache Disable */
+	u_int8_t rw_cache_policy;
+	u_int8_t dis_prefetch[2];
+	u_int8_t min_prefetch[2];
+	u_int8_t max_prefetch[2];
+	u_int8_t max_prefetch_ceil[2];
+};
+
+struct scsi_info_exceptions_page {
+	u_int8_t page_code;
+#define SIEP_PAGE_SAVABLE		0x80	/* Page is savable */
+	u_int8_t page_length;
+	u_int8_t info_flags;
+#define SIEP_FLAGS_PERF			0x80
+#define SIEP_FLAGS_EBF			0x20
+#define SIEP_FLAGS_EWASC		0x10
+#define SIEP_FLAGS_DEXCPT		0x08
+#define SIEP_FLAGS_TEST			0x04
+#define SIEP_FLAGS_EBACKERR		0x02
+#define SIEP_FLAGS_LOGERR		0x01
+	u_int8_t mrie;
+	u_int8_t interval_timer[4];
+	u_int8_t report_count[4];
+};
+
+struct scsi_proto_specific_page {
+	u_int8_t page_code;
+#define SPSP_PAGE_SAVABLE		0x80	/* Page is savable */
+	u_int8_t page_length;
+	u_int8_t protocol;
+#define SPSP_PROTO_FC			0x00
+#define SPSP_PROTO_SPI			0x01
+#define SPSP_PROTO_SSA			0x02
+#define SPSP_PROTO_1394			0x03
+#define SPSP_PROTO_RDMA			0x04
+#define SPSP_PROTO_ISCSI		0x05
+#define SPSP_PROTO_SAS			0x06
+#define SPSP_PROTO_ADT			0x07
+#define SPSP_PROTO_ATA			0x08
+#define SPSP_PROTO_NONE			0x0f
+};
+
 struct scsi_reserve
 {
 	u_int8_t opcode;
@@ -468,6 +522,47 @@
 	u_int8_t control;
 };
 
+struct ata_pass_12 {
+	u_int8_t opcode;
+	u_int8_t protocol;
+#define AP_MULTI	0xe0
+	u_int8_t flags;
+#define AP_T_LEN	0x03
+#define AP_BB		0x04
+#define AP_T_DIR	0x08
+#define AP_CK_COND	0x20
+#define AP_OFFLINE	0x60
+	u_int8_t features;
+	u_int8_t sector_count;
+	u_int8_t lba_low;
+	u_int8_t lba_mid;
+	u_int8_t lba_high;
+	u_int8_t device;
+	u_int8_t command;
+	u_int8_t reserved;
+	u_int8_t control;
+};
+
+struct ata_pass_16 {
+	u_int8_t opcode;
+	u_int8_t protocol;
+#define AP_EXTEND	0x01
+	u_int8_t flags;
+	u_int8_t features_ext;
+	u_int8_t features;
+	u_int8_t sector_count_ext;
+	u_int8_t sector_count;
+	u_int8_t lba_low_ext;
+	u_int8_t lba_low;
+	u_int8_t lba_mid_ext;
+	u_int8_t lba_mid;
+	u_int8_t lba_high_ext;
+	u_int8_t lba_high;
+	u_int8_t device;
+	u_int8_t command;
+	u_int8_t control;
+};
+
 #define SC_SCSI_1 0x01
 #define SC_SCSI_2 0x03
 
@@ -494,6 +589,7 @@
 #define WRITE_10		0x2a
 #define POSITION_TO_ELEMENT	0x2b
 #define	SYNCHRONIZE_CACHE	0x35
+#define	READ_DEFECT_DATA_10	0x37
 #define	WRITE_BUFFER            0x3b
 #define	READ_BUFFER             0x3c
 #define	CHANGE_DEFINITION	0x40
@@ -501,10 +597,12 @@
 #define	LOG_SENSE		0x4d
 #define	MODE_SELECT_10		0x55
 #define	MODE_SENSE_10		0x5A
+#define	ATA_PASS_16		0x85
 #define	READ_16			0x88
 #define	WRITE_16		0x8a
 #define	SERVICE_ACTION_IN	0x9e
 #define	REPORT_LUNS		0xA0
+#define	ATA_PASS_12		0xa1
 #define	MOVE_MEDIUM     	0xa5
 #define	READ_12			0xa8
 #define	WRITE_12		0xaa
@@ -663,6 +761,17 @@
 	u_int8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
 };
 
+struct scsi_vpd_supported_page_list
+{
+	u_int8_t device;
+	u_int8_t page_code;
+#define SVPD_SUPPORTED_PAGE_LIST 0x00
+	u_int8_t reserved;
+	u_int8_t length;	/* number of VPD entries */
+#define SVPD_SUPPORTED_PAGES_SIZE	251
+	u_int8_t list[SVPD_SUPPORTED_PAGES_SIZE];
+};
+
 struct scsi_vpd_unit_serial_number
 {
 	u_int8_t device;
@@ -1231,7 +1340,7 @@
 {
 	void *page_start;
 
-	page_start = (void *)((u_int8_t *)&mode_header[1] +
+	page_start = (void *)((u_int8_t *)&mode_header[2] +
 			       scsi_2btoul(mode_header->blk_desc_len));
 
 	return(page_start);

==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#12 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.115 2007/06/05 00:00:50 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.116 2007/10/12 06:03:42 kevlo Exp $");
 
 #include "opt_compat.h"
 #include "opt_vimage.h"
@@ -118,7 +118,7 @@
  *
  * The linux procfs state field displays one of the characters RSDZTW to
  * denote running, sleeping in an interruptible wait, waiting in an
- * uninteruptible disk sleep, a zombie process, process is being traced
+ * uninterruptible disk sleep, a zombie process, process is being traced
  * or stopped, or process is paging respectively.
  *
  * Our struct kinfo_proc contains the variable ki_stat which contains a

==== //depot/projects/vimage/src/sys/conf/files#20 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1243 2007/09/23 07:34:22 pjd Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1246 2007/10/15 20:00:20 netchild Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/vimage/src/sys/conf/files.amd64#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.107 2007/08/15 19:26:01 des Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.109 2007/10/15 20:00:21 netchild Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/vimage/src/sys/conf/files.i386#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.i386,v 1.580 2007/08/15 19:26:01 des Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.582 2007/10/15 20:00:21 netchild Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/vimage/src/sys/conf/newvers.sh#2 (text+ko) ====

@@ -28,10 +28,10 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.72 2005/08/19 03:56:45 cperciva Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.73 2007/10/11 04:28:07 kensmith Exp $
 
 TYPE="FreeBSD"
-REVISION="7.0"
+REVISION="8.0"
 BRANCH="CURRENT"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}

==== //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 (text+ko) ====

@@ -290,6 +290,7 @@
 	mutex_exit(&spa->spa_errlist_lock);
 
 	sbuf_finish(&sb);
+	ZFS_LOG(1, "%s", sbuf_data(&sb));
 	devctl_notify("ZFS", spa->spa_name, subclass, sbuf_data(&sb));
 	if (sbuf_overflowed(&sb))
 		printf("ZFS WARNING: sbuf overflowed\n");

==== //depot/projects/vimage/src/sys/ddb/db_ps.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/cons.h>
@@ -295,6 +295,8 @@
 	db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc);
 	if (td->td_name[0] != '\0')
 		db_printf(" name: %s\n", td->td_name);
+	db_printf(" stack: %p-%p\n", (void *)td->td_kstack,
+	    (void *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE - 1));
 	db_printf(" flags: %#x ", td->td_flags);
 	db_printf(" pflags: %#x\n", td->td_pflags);
 	db_printf(" state: ");

==== //depot/projects/vimage/src/sys/dev/aac/aac.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120 2007/02/23 12:18:29 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.121 2007/10/15 17:34:58 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -1670,14 +1670,12 @@
 	sc->aac_max_sectors = 128;				/* 64KB */
 	if (sc->flags & AAC_FLAGS_SG_64BIT)
 		sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
-		 - sizeof(struct aac_blockwrite64)
-		 + sizeof(struct aac_sg_table64))
-		 / sizeof(struct aac_sg_table64);
+		 - sizeof(struct aac_blockwrite64))
+		 / sizeof(struct aac_sg_entry64);
 	else
 		sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
-		 - sizeof(struct aac_blockwrite)
-		 + sizeof(struct aac_sg_table))
-		 / sizeof(struct aac_sg_table);
+		 - sizeof(struct aac_blockwrite))
+		 / sizeof(struct aac_sg_entry);
 
 	if (!aac_sync_command(sc, AAC_MONKER_GETCOMMPREF, 0, 0, 0, 0, NULL)) {
 		options = AAC_GET_MAILBOX(sc, 1);

==== //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62 2007/08/23 20:12:40 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.63 2007/10/14 19:40:15 emaste Exp $");
 
 /*
  * PCI bus interface and resource allocation.
@@ -176,6 +176,8 @@
 	 "Adaptec SAS RAID 4005SAS"},
 	{0x9005, 0x0285, 0x1014, 0x02f2, AAC_HWIF_I960RX, 0,
 	 "IBM ServeRAID 8i"},
+	{0x9005, 0x0285, 0x1014, 0x0312, AAC_HWIF_I960RX, 0,
+	 "IBM ServeRAID 8i"},
 	{0x9005, 0x0285, 0x9005, 0x0298, AAC_HWIF_I960RX, 0,
 	 "Adaptec SAS RAID 4000SAS"},
 	{0x9005, 0x0285, 0x9005, 0x0299, AAC_HWIF_I960RX, 0,
@@ -194,12 +196,52 @@
 	 "ICP ICP9047MA SATA RAID"},
 	{0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
 	 "ICP ICP9087MA SATA RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0,
+	 "ICP9067MA SATA RAID"},
+	{0x9005, 0x0285, 0x9005, 0x02b5, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 5445"},

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


More information about the p4-projects mailing list