From owner-p4-projects@FreeBSD.ORG  Sat Nov  4 08:22:41 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A880F16A415; Sat,  4 Nov 2006 08:22:41 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8080E16A40F
	for <perforce@FreeBSD.org>; Sat,  4 Nov 2006 08:22:41 +0000 (UTC)
	(envelope-from als@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4110A43D49
	for <perforce@FreeBSD.org>; Sat,  4 Nov 2006 08:22:41 +0000 (GMT)
	(envelope-from als@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA48MfdE033911
	for <perforce@FreeBSD.org>; Sat, 4 Nov 2006 08:22:41 GMT
	(envelope-from als@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA48MMFT033807
	for perforce@freebsd.org; Sat, 4 Nov 2006 08:22:22 GMT
	(envelope-from als@FreeBSD.org)
Date: Sat, 4 Nov 2006 08:22:22 GMT
Message-Id: <200611040822.kA48MMFT033807@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	als@FreeBSD.org using -f
From: Alex Lyashkov <als@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 109221 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Nov 2006 08:22:42 -0000

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

Change 109221 by als@als_head on 2006/11/04 08:22:03

	Intergrate last changes from HEAD.

Affected files ...

.. //depot/projects/jail2/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/io_apic.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/jail2/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/jail2/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/jail2/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/jail2/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/jail2/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/jail2/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/asmacros.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/profile.h#2 integrate
.. //depot/projects/jail2/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#5 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#5 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#5 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#5 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#5 integrate
.. //depot/projects/jail2/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/jail2/sys/arm/arm/elf_trampoline.c#5 integrate
.. //depot/projects/jail2/sys/arm/arm/fusu.S#4 integrate
.. //depot/projects/jail2/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/nexus_io.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/trap.c#3 integrate
.. //depot/projects/jail2/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_mci.c#1 branch
.. //depot/projects/jail2/sys/arm/at91/at91_mcireg.h#1 branch
.. //depot/projects/jail2/sys/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_ssc.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_sscreg.h#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/jail2/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/jail2/sys/arm/at91/std.at91#3 integrate
.. //depot/projects/jail2/sys/arm/at91/std.kb920x#3 integrate
.. //depot/projects/jail2/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/jail2/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/jail2/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/jail2/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/jail2/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/sa11x0.c#2 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/jail2/sys/boot/Makefile#4 integrate
.. //depot/projects/jail2/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/Makefile.inc#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/main.c#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot2/Makefile#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/boot2/boot2.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/Makefile#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/ee.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/ee.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/main.c#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/Makefile#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200.h#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.c#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.h#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/mci_device.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/mci_device.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/memcmp.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/memset.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/p_string.c#3 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/printf.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/putchar.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/sd-card.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/strcmp.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/strcpy.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/strcvt.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/strlen.c#1 branch
.. //depot/projects/jail2/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/jail2/sys/boot/common/bootstrap.h#2 integrate
.. //depot/projects/jail2/sys/boot/common/devopen.c#2 integrate
.. //depot/projects/jail2/sys/boot/common/help.common#3 integrate
.. //depot/projects/jail2/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/jail2/sys/boot/common/loader.8#3 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efi.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efi_nii.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efiapi.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/eficon.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efidebug.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efidef.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efidevp.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efierr.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efifs.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efilib.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efinet.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efipart.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efiprot.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efipxebc.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efiser.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/efistdarg.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/i386/efibind.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/i386/pe.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/ia64/efibind.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/include/ia64/pe.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/libefi/devicename.c#2 integrate
.. //depot/projects/jail2/sys/boot/efi/libefi/efiboot.h#2 integrate
.. //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#2 integrate
.. //depot/projects/jail2/sys/boot/efi/libefi/libefi.c#2 integrate
.. //depot/projects/jail2/sys/boot/forth/support.4th#2 integrate
.. //depot/projects/jail2/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo32.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/libi386.h#3 integrate
.. //depot/projects/jail2/sys/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/jail2/sys/boot/ia64/efi/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/ia64/ski/acpi_stub.c#2 integrate
.. //depot/projects/jail2/sys/boot/ia64/ski/devicename.c#2 integrate
.. //depot/projects/jail2/sys/boot/ia64/ski/libski.h#2 integrate
.. //depot/projects/jail2/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/ofw/common/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/jail2/sys/boot/ofw/libofw/openfirm.c#2 integrate
.. //depot/projects/jail2/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch
.. //depot/projects/jail2/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/loader/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/loader/main.c#3 integrate
.. //depot/projects/jail2/sys/boot/sparc64/loader/hcall.S#1 branch
.. //depot/projects/jail2/sys/boot/sparc64/loader/main.c#2 integrate
.. //depot/projects/jail2/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/jail2/sys/cam/cam_xpt.c#4 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_low.c#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_emul.c#3 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_emul.h#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_misc.c#7 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_misc.h#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_signal.h#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_stats.c#4 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/jail2/sys/conf/NOTES#8 integrate
.. //depot/projects/jail2/sys/conf/files#7 integrate
.. //depot/projects/jail2/sys/conf/files.amd64#6 integrate
.. //depot/projects/jail2/sys/conf/files.i386#5 integrate
.. //depot/projects/jail2/sys/conf/files.ia64#3 integrate
.. //depot/projects/jail2/sys/conf/files.pc98#3 integrate
.. //depot/projects/jail2/sys/conf/files.powerpc#4 integrate
.. //depot/projects/jail2/sys/conf/files.sparc64#2 integrate
.. //depot/projects/jail2/sys/conf/files.sun4v#2 integrate
.. //depot/projects/jail2/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/jail2/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/jail2/sys/conf/kmod.mk#3 integrate
.. //depot/projects/jail2/sys/conf/options#7 integrate
.. //depot/projects/jail2/sys/conf/options.sparc64#2 integrate
.. //depot/projects/jail2/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/jail2/sys/crypto/sha2/sha2.c#3 integrate
.. //depot/projects/jail2/sys/ddb/db_command.c#4 integrate
.. //depot/projects/jail2/sys/ddb/db_examine.c#2 integrate
.. //depot/projects/jail2/sys/ddb/db_output.c#3 integrate
.. //depot/projects/jail2/sys/ddb/db_output.h#3 integrate
.. //depot/projects/jail2/sys/ddb/db_ps.c#4 integrate
.. //depot/projects/jail2/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/jail2/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/acpi_support/acpi_aiboost.c#1 branch
.. //depot/projects/jail2/sys/dev/acpi_support/acpi_sony.c#2 integrate
.. //depot/projects/jail2/sys/dev/advansys/advansys.c#2 integrate
.. //depot/projects/jail2/sys/dev/advansys/advlib.c#2 integrate
.. //depot/projects/jail2/sys/dev/advansys/adwcam.c#2 integrate
.. //depot/projects/jail2/sys/dev/aha/aha.c#2 integrate
.. //depot/projects/jail2/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/jail2/sys/dev/aic/aic.c#2 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/jail2/sys/dev/amd/amd.c#2 integrate
.. //depot/projects/jail2/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/jail2/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/jail2/sys/dev/amr/amr_disk.c#2 integrate
.. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/jail2/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/jail2/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/jail2/sys/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/jail2/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/jail2/sys/dev/awi/if_awi_pccard.c#2 integrate
.. //depot/projects/jail2/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/jail2/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bge.c#8 integrate
.. //depot/projects/jail2/sys/dev/buslogic/bt.c#2 integrate
.. //depot/projects/jail2/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/jail2/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/jail2/sys/dev/dpt/dpt_scsi.c#3 integrate
.. //depot/projects/jail2/sys/dev/em/if_em.c#7 integrate
.. //depot/projects/jail2/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_hw.c#3 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_hw.h#3 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_osdep.h#3 integrate
.. //depot/projects/jail2/sys/dev/esp/ncr53c9x.c#2 integrate
.. //depot/projects/jail2/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/jail2/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/jail2/sys/dev/ipmi/ipmi.c#4 integrate
.. //depot/projects/jail2/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#5 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_library.c#3 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_library.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#4 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_stds.h#1 branch
.. //depot/projects/jail2/sys/dev/isp/isp_target.c#3 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_target.h#3 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/jail2/sys/dev/isp/ispmbox.h#3 integrate
.. //depot/projects/jail2/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/jail2/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/jail2/sys/dev/ispfw/asm_2300.h#2 integrate
.. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/jail2/sys/dev/iwi/if_iwireg.h#2 integrate
.. //depot/projects/jail2/sys/dev/md/md.c#2 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi_debug.c#2 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfireg.h#4 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfivar.h#5 integrate
.. //depot/projects/jail2/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/jail2/sys/dev/mmc/bridge.h#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmc.c#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcbr_if.m#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcbrvar.h#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcbus_if.m#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcreg.h#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcsd.c#1 branch
.. //depot/projects/jail2/sys/dev/mmc/mmcvar.h#1 branch
.. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#6 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/jail2/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/jail2/sys/dev/nfe/if_nfereg.h#3 integrate
.. //depot/projects/jail2/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/jail2/sys/dev/ofw/openfirm.h#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_if.m#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/jail2/sys/dev/ray/if_ray.c#2 integrate
.. //depot/projects/jail2/sys/dev/sk/if_sk.c#3 integrate
.. //depot/projects/jail2/sys/dev/sk/if_skreg.h#3 integrate
.. //depot/projects/jail2/sys/dev/sound/midi/sequencer.c#5 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/jail2/sys/dev/spibus/spibus.c#2 integrate
.. //depot/projects/jail2/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/jail2/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/jail2/sys/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#4 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.h#2 integrate
.. //depot/projects/jail2/sys/dev/ubsec/ubsec.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/if_cdce.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/ohci.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/ubsa.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/ukbd.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usb.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/jail2/sys/dev/usb/usbdi.h#3 integrate
.. //depot/projects/jail2/sys/dev/usb/uscanner.c#5 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs.h#3 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_devs.c#4 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/denode.h#3 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/ntfs/ntfs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/nwfs/nwfs_subr.c#3 integrate
.. //depot/projects/jail2/sys/fs/procfs/procfs_status.c#3 integrate
.. //depot/projects/jail2/sys/fs/smbfs/smbfs_subr.c#2 integrate
.. //depot/projects/jail2/sys/geom/concat/g_concat.c#2 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli.c#4 integrate
.. //depot/projects/jail2/sys/geom/geom.h#4 integrate
.. //depot/projects/jail2/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/jail2/sys/geom/geom_disk.h#2 integrate
.. //depot/projects/jail2/sys/geom/geom_gpt.c#4 integrate
.. //depot/projects/jail2/sys/geom/geom_io.c#2 integrate
.. //depot/projects/jail2/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/jail2/sys/geom/journal/g_journal.c#1 branch
.. //depot/projects/jail2/sys/geom/journal/g_journal.h#1 branch
.. //depot/projects/jail2/sys/geom/journal/g_journal_ufs.c#1 branch
.. //depot/projects/jail2/sys/geom/mirror/g_mirror.c#4 integrate
.. //depot/projects/jail2/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/jail2/sys/geom/mirror/g_mirror_ctl.c#3 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3.c#5 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3.h#2 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3_ctl.c#4 integrate
.. //depot/projects/jail2/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/jail2/sys/geom/stripe/g_stripe.c#2 integrate
.. //depot/projects/jail2/sys/i386/acpica/Makefile#3 integrate
.. //depot/projects/jail2/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/jail2/sys/i386/i386/db_trace.c#5 integrate
.. //depot/projects/jail2/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/jail2/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/jail2/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/jail2/sys/i386/i386/support.s#4 integrate
.. //depot/projects/jail2/sys/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/jail2/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/asmacros.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/profile.h#2 integrate
.. //depot/projects/jail2/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/jail2/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/jail2/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_dummy.c#5 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#5 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_proto.h#6 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#6 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#6 integrate
.. //depot/projects/jail2/sys/i386/linux/syscalls.master#6 integrate
.. //depot/projects/jail2/sys/ia64/conf/DEFAULTS#3 integrate
.. //depot/projects/jail2/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/ia64/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/clock.c#3 integrate
.. //depot/projects/jail2/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/jail2/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/jail2/sys/ia64/ia64/support.S#3 integrate
.. //depot/projects/jail2/sys/ia64/ia64/trap.c#4 integrate
.. //depot/projects/jail2/sys/kern/init_main.c#5 integrate
.. //depot/projects/jail2/sys/kern/init_sysent.c#7 integrate
.. //depot/projects/jail2/sys/kern/kern_acct.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_acl.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/jail2/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_linker.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_mac.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/jail2/sys/kern/kern_prot.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_sysctl.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_thr.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_time.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/jail2/sys/kern/link_elf.c#4 integrate
.. //depot/projects/jail2/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/jail2/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/jail2/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/jail2/sys/kern/subr_disk.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_fattime.c#1 branch
.. //depot/projects/jail2/sys/kern/subr_prf.c#4 integrate
.. //depot/projects/jail2/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/jail2/sys/kern/sys_generic.c#4 integrate
.. //depot/projects/jail2/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/jail2/sys/kern/sys_process.c#3 integrate
.. //depot/projects/jail2/sys/kern/sys_socket.c#3 integrate
.. //depot/projects/jail2/sys/kern/syscalls.c#7 integrate
.. //depot/projects/jail2/sys/kern/syscalls.master#7 integrate
.. //depot/projects/jail2/sys/kern/systrace_args.c#6 integrate
.. //depot/projects/jail2/sys/kern/sysv_msg.c#4 integrate
.. //depot/projects/jail2/sys/kern/sysv_sem.c#5 integrate
.. //depot/projects/jail2/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/jail2/sys/kern/tty.c#6 integrate
.. //depot/projects/jail2/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/jail2/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/jail2/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/jail2/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/jail2/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/jail2/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/jail2/sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/jail2/sys/kern/vfs_cluster.c#3 integrate
.. //depot/projects/jail2/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/jail2/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/jail2/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/jail2/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/jail2/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/jail2/sys/modules/acpi/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/acpi/acpi_aiboost/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/aio/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/ath_rate_amrr/Makefile#3 integrate
.. //depot/projects/jail2/sys/modules/bge/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/jail2/sys/modules/geom/geom_journal/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/jail2/sys/modules/mem/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/mmc/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/mmcsd/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/nfe/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/ufs/Makefile#2 integrate
.. //depot/projects/jail2/sys/net/bpf.c#3 integrate
.. //depot/projects/jail2/sys/net/bridgestp.c#4 integrate
.. //depot/projects/jail2/sys/net/bridgestp.h#2 integrate
.. //depot/projects/jail2/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/jail2/sys/net/if.c#6 integrate
.. //depot/projects/jail2/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/jail2/sys/net/if_bridge.c#7 integrate
.. //depot/projects/jail2/sys/net/if_bridgevar.h#3 integrate
.. //depot/projects/jail2/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/jail2/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_gif.c#3 integrate
.. //depot/projects/jail2/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_ppp.c#3 integrate
.. //depot/projects/jail2/sys/net/if_stf.c#3 integrate
.. //depot/projects/jail2/sys/net/if_tap.c#4 integrate
.. //depot/projects/jail2/sys/net/if_tun.c#3 integrate
.. //depot/projects/jail2/sys/net/if_vlan.c#6 integrate
.. //depot/projects/jail2/sys/net/ppp_tty.c#2 integrate
.. //depot/projects/jail2/sys/net/rtsock.c#4 integrate
.. //depot/projects/jail2/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_output.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_device.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/jail2/sys/netgraph/ng_socket.h#2 integrate
.. //depot/projects/jail2/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/jail2/sys/netinet/igmp.c#2 integrate
.. //depot/projects/jail2/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/jail2/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/jail2/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/jail2/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/jail2/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/jail2/sys/netinet/libalias/libalias.3#4 integrate
.. //depot/projects/jail2/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_asconf.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_asconf.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_auth.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_auth.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_constants.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_crc32.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_crc32.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_header.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_indata.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_indata.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_input.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_input.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_lock_bsd.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_os.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_os_bsd.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_output.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_output.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_pcb.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_pcb.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_peeloff.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_peeloff.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_structs.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_timer.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_timer.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_uio.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctp_var.h#1 branch
.. //depot/projects/jail2/sys/netinet/sctputil.c#1 branch
.. //depot/projects/jail2/sys/netinet/sctputil.h#1 branch
.. //depot/projects/jail2/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/jail2/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/jail2/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/jail2/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/jail2/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/jail2/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/jail2/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#1 branch
.. //depot/projects/jail2/sys/netinet6/sctp6_var.h#1 branch
.. //depot/projects/jail2/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#3 integrate
.. //depot/projects/jail2/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/jail2/sys/pci/agp.c#3 integrate
.. //depot/projects/jail2/sys/pci/agp_amd64.c#3 integrate
.. //depot/projects/jail2/sys/pci/if_sis.c#3 integrate
.. //depot/projects/jail2/sys/pci/ncr.c#3 integrate
.. //depot/projects/jail2/sys/pci/nfsmb.c#4 integrate
.. //depot/projects/jail2/sys/posix4/ksched.c#3 integrate
.. //depot/projects/jail2/sys/powerpc/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/powerpc/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/copyinout.c#3 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/trap.c#4 integrate
.. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/jail2/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/jail2/sys/security/mac/mac_inet.c#4 integrate
.. //depot/projects/jail2/sys/security/mac/mac_label.c#2 integrate
.. //depot/projects/jail2/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_pipe.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_posix_sem.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_socket.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_system.c#2 integrate
.. //depot/projects/jail2/sys/security/mac/mac_sysv_msg.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_sysv_sem.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/jail2/sys/security/mac/mac_vfs.c#4 integrate
.. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/jail2/sys/security/mac_portacl/mac_portacl.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/jail2/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/sparc64/include/asi.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/endian.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/db_interface.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/support.S#3 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/trap.c#3 integrate
.. //depot/projects/jail2/sys/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/jail2/sys/sun4v/conf/NOTES#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/asi.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/endian.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/hypervisor_api.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/hypervisorvar.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/trap.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/tte.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/utrap.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/fpemu.c#2 delete
.. //depot/projects/jail2/sys/sun4v/sun4v/genassym.c#2 delete
.. //depot/projects/jail2/sys/sun4v/sun4v/hcall.S#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/support.S#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/t1_copy.S#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#2 integrate
.. //depot/projects/jail2/sys/sys/bio.h#2 integrate
.. //depot/projects/jail2/sys/sys/clock.h#3 integrate
.. //depot/projects/jail2/sys/sys/conf.h#2 integrate
.. //depot/projects/jail2/sys/sys/cons.h#2 integrate
.. //depot/projects/jail2/sys/sys/elf32.h#3 integrate
.. //depot/projects/jail2/sys/sys/elf64.h#3 integrate
.. //depot/projects/jail2/sys/sys/libkern.h#3 integrate
.. //depot/projects/jail2/sys/sys/mac.h#3 integrate
.. //depot/projects/jail2/sys/sys/mac_policy.h#4 integrate
.. //depot/projects/jail2/sys/sys/mbuf.h#5 integrate
.. //depot/projects/jail2/sys/sys/mount.h#4 integrate
.. //depot/projects/jail2/sys/sys/param.h#6 integrate
.. //depot/projects/jail2/sys/sys/pcpu.h#2 integrate
.. //depot/projects/jail2/sys/sys/proc.h#4 integrate
.. //depot/projects/jail2/sys/sys/queue.h#2 integrate
.. //depot/projects/jail2/sys/sys/rtprio.h#3 integrate
.. //depot/projects/jail2/sys/sys/rwlock.h#3 integrate
.. //depot/projects/jail2/sys/sys/sched.h#3 integrate
.. //depot/projects/jail2/sys/sys/sem.h#2 integrate
.. //depot/projects/jail2/sys/sys/socket.h#3 integrate
.. //depot/projects/jail2/sys/sys/soundcard.h#3 integrate
.. //depot/projects/jail2/sys/sys/syscall.h#7 integrate
.. //depot/projects/jail2/sys/sys/syscall.mk#7 integrate
.. //depot/projects/jail2/sys/sys/sysproto.h#7 integrate
.. //depot/projects/jail2/sys/sys/systm.h#6 integrate
.. //depot/projects/jail2/sys/sys/umtx.h#4 integrate
.. //depot/projects/jail2/sys/sys/vnode.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_extern.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/fs.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/gjournal.h#1 branch
.. //depot/projects/jail2/sys/ufs/ufs/inode.h#3 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_gjournal.c#1 branch
.. //depot/projects/jail2/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#5 integrate
.. //depot/projects/jail2/sys/vm/device_pager.c#3 integrate
.. //depot/projects/jail2/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/jail2/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/jail2/sys/vm/uma_core.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/jail2/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/jail2/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/jail2/sys/vm/vm_map.c#4 integrate
.. //depot/projects/jail2/sys/vm/vm_mmap.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_object.c#5 integrate
.. //depot/projects/jail2/sys/vm/vm_page.c#6 integrate
.. //depot/projects/jail2/sys/vm/vm_page.h#5 integrate
.. //depot/projects/jail2/sys/vm/vm_pageout.c#4 integrate
.. //depot/projects/jail2/sys/vm/vm_zeroidle.c#3 integrate
.. //depot/projects/jail2/sys/vm/vnode_pager.c#3 integrate

Differences ...

==== //depot/projects/jail2/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -520,7 +520,7 @@
 		    __func__, dmat, dmat->flags, ENOMEM);
 		return (ENOMEM);
 	} else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) {
-		printf("bus_dmamem_alloc failed to align memory properly.");
+		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->flags, ENOMEM);

==== //depot/projects/jail2/sys/amd64/amd64/db_trace.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.76 2006/10/20 09:44:20 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,6 +91,7 @@
 	{ "r15",	DB_OFFSET(tf_r15),	db_frame },
 	{ "rip",	DB_OFFSET(tf_rip),	db_frame },
 	{ "rflags",	DB_OFFSET(tf_rflags),	db_frame },
+#define	DB_N_SHOW_REGS	20	/* Don't show registers after here. */
 	{ "dr0",	NULL,			db_dr0 },
 	{ "dr1",	NULL,			db_dr1 },
 	{ "dr2",	NULL,			db_dr2 },
@@ -100,7 +101,7 @@
 	{ "dr6",	NULL,			db_dr6 },
 	{ "dr7",	NULL,			db_dr7 },
 };
-struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
+struct db_variable *db_eregs = db_regs + DB_N_SHOW_REGS;
 
 #define DB_DRX_FUNC(reg)		\
 static int				\

==== //depot/projects/jail2/sys/amd64/amd64/genassym.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.157 2005/09/27 21:10:10 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
@@ -185,6 +185,7 @@
 ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread));
 ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread));
 ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
+ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr));
 ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
 ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp));
 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));

==== //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#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/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
  * that source.
  */
 
+#include "opt_atpic.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>
@@ -55,6 +56,14 @@
 #include <ddb/ddb.h>
 #endif
 
+#ifndef DEV_ATPIC
+#include <machine/segments.h>
+#include <machine/frame.h>
+#include <dev/ic/i8259.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/isa.h>
+#endif
+
 #define	MAX_STRAY_LOG	5
 
 typedef void (*mask_fn)(void *);
@@ -62,6 +71,7 @@
 static int intrcnt_index;
 static struct intsrc *interrupt_sources[NUM_IO_INTS];
 static struct mtx intr_table_lock;
+static STAILQ_HEAD(, pic) pics;
 
 #ifdef SMP
 static int assign_cpu;
@@ -70,10 +80,45 @@
 #endif
 
 static void	intr_init(void *__dummy);
+static int	intr_pic_registered(struct pic *pic);
 static void	intrcnt_setname(const char *name, int index);
 static void	intrcnt_updatename(struct intsrc *is);
 static void	intrcnt_register(struct intsrc *is);
 
+static int
+intr_pic_registered(struct pic *pic)
+{
+	struct pic *p;
+
+	STAILQ_FOREACH(p, &pics, pics) {
+		if (p == pic)
+			return (1);
+	}
+	return (0);
+}
+
+/*
+ * Register a new interrupt controller (PIC).  This is to support suspend
+ * and resume where we suspend/resume controllers rather than individual
+ * sources.  This also allows controllers with no active sources (such as
+ * 8259As in a system using the APICs) to participate in suspend and resume.
+ */
+int
+intr_register_pic(struct pic *pic)
+{
+	int error;
+
+	mtx_lock_spin(&intr_table_lock);
+	if (intr_pic_registered(pic))
+		error = EBUSY;
+	else {
+		STAILQ_INSERT_TAIL(&pics, pic, pics);
+		error = 0;
+	}
+	mtx_unlock_spin(&intr_table_lock);
+	return (error);
+}
+
 /*
  * Register a new interrupt source with the global interrupt system.
  * The global interrupts need to be disabled when this function is
@@ -84,6 +129,7 @@
 {
 	int error, vector;
 
+	KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC"));
 	vector = isrc->is_pic->pic_vector(isrc);
 	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
@@ -255,26 +301,29 @@
 void
 intr_resume(void)
 {
-	struct intsrc **isrc;
-	int i;
+	struct pic *pic;
 
+#ifndef DEV_ATPIC
+	atpic_reset();
+#endif
 	mtx_lock_spin(&intr_table_lock);
-	for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++)
-		if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL)
-			(*isrc)->is_pic->pic_resume(*isrc);
+	STAILQ_FOREACH(pic, &pics, pics) {
+		if (pic->pic_resume != NULL)
+			pic->pic_resume(pic);
+	}
 	mtx_unlock_spin(&intr_table_lock);
 }
 
 void
 intr_suspend(void)
 {
-	struct intsrc **isrc;
-	int i;
+	struct pic *pic;
 
 	mtx_lock_spin(&intr_table_lock);
-	for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++)
-		if (*isrc != NULL && (*isrc)->is_pic->pic_suspend != NULL)
-			(*isrc)->is_pic->pic_suspend(*isrc);
+	STAILQ_FOREACH(pic, &pics, pics) {
+		if (pic->pic_suspend != NULL)
+			pic->pic_suspend(pic);
+	}
 	mtx_unlock_spin(&intr_table_lock);
 }
 
@@ -327,10 +376,33 @@
 
 	intrcnt_setname("???", 0);
 	intrcnt_index = 1;
+	STAILQ_INIT(&pics);
 	mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN);
 }
 SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL)
 
+#ifndef DEV_ATPIC
+/* Initialize the two 8259A's to a known-good shutdown state. */
+void
+atpic_reset(void)
+{
+
+	outb(IO_ICU1, ICW1_RESET | ICW1_IC4);
+	outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS);
+	outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2);
+	outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086);
+	outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff);
+	outb(IO_ICU1, OCW3_SEL | OCW3_RR);
+
+	outb(IO_ICU2, ICW1_RESET | ICW1_IC4);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, 2);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086);
+	outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff);
+	outb(IO_ICU2, OCW3_SEL | OCW3_RR);
+}
+#endif
+
 #ifdef DDB
 /*
  * Dump data about interrupt handlers

==== //depot/projects/jail2/sys/amd64/amd64/io_apic.c#2 (text+ko) ====

@@ -28,9 +28,8 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $");
 
-#include "opt_atpic.h"
 #include "opt_isa.h"
 
 #include <sys/param.h>
@@ -61,8 +60,6 @@
 #define	IRQ_SMI			(NUM_IO_INTS + 3)
 #define	IRQ_DISABLED		(NUM_IO_INTS + 4)
 
-#define	TODO		printf("%s: not implemented!\n", __func__)
-
 static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures");
 
 /*
@@ -115,8 +112,7 @@
 static int	ioapic_source_pending(struct intsrc *isrc);
 static int	ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
 		    enum intr_polarity pol);
-static void	ioapic_suspend(struct intsrc *isrc);
-static void	ioapic_resume(struct intsrc *isrc);
+static void	ioapic_resume(struct pic *pic);
 static void	ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id);
 static void	ioapic_program_intpin(struct ioapic_intsrc *intpin);
 
@@ -124,7 +120,7 @@
 struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source,
 			       ioapic_eoi_source, ioapic_enable_intr,
 			       ioapic_vector, ioapic_source_pending,
-			       ioapic_suspend, ioapic_resume,
+			       NULL, ioapic_resume,
 			       ioapic_config_intr, ioapic_assign_cpu };
 
 static int next_ioapic_base;
@@ -419,17 +415,13 @@
 }
 
 static void
-ioapic_suspend(struct intsrc *isrc)
+ioapic_resume(struct pic *pic)
 {
+	struct ioapic *io = (struct ioapic *)pic;
+	int i;
 
-	TODO;
-}
-
-static void

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