From owner-trustedbsd-cvs@FreeBSD.ORG Fri Dec 1 12:53:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C94816A4C8 for ; Fri, 1 Dec 2006 12:53:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B55A943C9D for ; Fri, 1 Dec 2006 12:53:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 033DF46E89 for ; Fri, 1 Dec 2006 07:53:17 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id B93225B61D; Fri, 1 Dec 2006 12:51:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B8F16A416; Fri, 1 Dec 2006 12:51:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5ED7716A403 for ; Fri, 1 Dec 2006 12:51:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C52F43D2F for ; Fri, 1 Dec 2006 12:50:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB1ComBY071460 for ; Fri, 1 Dec 2006 12:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB1CoYv0071439 for perforce@freebsd.org; Fri, 1 Dec 2006 12:50:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 1 Dec 2006 12:50:34 GMT Message-Id: <200612011250.kB1CoYv0071439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 110794 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2006 12:53:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=110794 Change 110794 by rwatson@rwatson_zoo on 2006/12/01 12:49:42 Integrate trustedbsd_priv branch: loop back priv(9) work. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/devopen.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/elf32_freebsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#8 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sparc64#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options.sparc64#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_cdnr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/altq/altq/altq_rio.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_command.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aha/aha.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic/aic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amd/amd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/an/if_an.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/asr/asr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iir/iir.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_stds.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/md/md.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mly/mly.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/null/null.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/si/si.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/trm/trm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/zs/zs.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_disk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_disk.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_io.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_slice.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_environment.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_linker.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_priv.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_disk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_prf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_cons.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_pts.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_pty.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/bge/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/geom/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/bpf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_gre.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_ppp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_sl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tun.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/ppp_tty.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/rtsock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at_control.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netatm/atm_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_header.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netncp/ncp_subr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_sis.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pci/ncr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/bio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/cons.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/jail.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/libkern.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mount.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vnode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__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/trustedbsd/priv/sys/amd64/amd64/io.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.24 2006/09/09 16:25:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -868,7 +868,7 @@ */ if (sigcodesz) copyout(imgp->proc->p_sysent->sv_sigcode, - ((caddr_t)arginfo - sigcodesz), szsigcode); + ((caddr_t)arginfo - sigcodesz), sigcodesz); /* * If we have a valid auxargs ptr, prepare some room ==== //depot/projects/trustedbsd/priv/sys/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,11 +23,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.15 2006/10/30 23:23:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.16 2006/11/01 12:41:43 cognet Exp $"); #include -#include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/priv/sys/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.6 2005/10/06 11:26:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.7 2006/11/01 04:54:50 jb Exp $"); #include #include #include @@ -69,6 +69,7 @@ ASSYM(PCB_PC, offsetof(struct pcb, un_32.pcb32_pc)); ASSYM(PCB_SP, offsetof(struct pcb, un_32.pcb32_sp)); +ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ==== //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.11 2006/10/20 07:04:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.12 2006/11/03 07:39:37 imp Exp $"); #include #include @@ -195,7 +195,6 @@ ate_get_mac(sc, eaddr); ate_set_mac(sc, eaddr); - sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); @@ -271,10 +270,12 @@ * For the last buffer, set the wrap bit so the controller * restarts from the first descriptor. */ + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; else sc->rx_descs[i].addr = segs[0].ds_addr; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE); sc->rx_descs[i].status = 0; /* Flush the memory in the mbuf */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); @@ -489,11 +490,30 @@ } static void +ate_stat_update(struct ate_softc *sc, int active) +{ + /* + * The speed and full/half-duplex state needs to be reflected + * in the ETH_CFG register. + */ + if (IFM_SUBTYPE(active) == IFM_10_T) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + if (active & IFM_FDX) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); +} + +static void ate_tick(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; struct mii_data *mii; int active; + uint32_t c; /* * The KB920x boot loader tests ETH_SR & ETH_SR_LINK and will ask @@ -506,25 +526,8 @@ active = mii->mii_media_active; mii_tick(mii); if (mii->mii_media_status & IFM_ACTIVE && - active != mii->mii_media_active) { - /* - * The speed and full/half-duplex state needs - * to be reflected in the ETH_CFG register, it - * seems. - */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_SPD); - if (mii->mii_media_active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_FD); - } + active != mii->mii_media_active) + ate_stat_update(sc, mii->mii_media_active); } /* @@ -535,16 +538,25 @@ * the dot3Stats mib, so for those we just count them as general * errors. Stats for iframes, ibutes, oframes and obytes are * collected elsewhere. These registers zero on a read to prevent - * races. + * races. For all the collision stats, also update the collision + * stats for the interface. */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); + c = RD4(sc, ETH_SCOL); + ifp->if_collisions += c; + sc->mibdata.dot3StatsSingleCollisionFrames += c; + c = RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsMultipleCollisionFrames += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); - sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); - sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); + c = RD4(sc, ETH_LCOL); + sc->mibdata.dot3StatsLateCollisions += c; + ifp->if_collisions += c; + c = RD4(sc, ETH_ECOL); + sc->mibdata.dot3StatsExcessiveCollisions += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -552,7 +564,7 @@ * not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->ifp->if_oerrors += RD4(sc, ETH_TUE); sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF); @@ -577,9 +589,9 @@ uint32_t low, high; /* - * The KB920x loaders will setup the MAC with an address, if one - * is set in the loader. The TSC loader will also set the MAC address - * in a similar way. Grab the MAC address from the SA1[HL] registers. + * The boot loader setup the MAC with an address, if one is set in + * the loader. The TSC loader will also set the MAC address in a + * similar way. Grab the MAC address from the SA1[HL] registers. */ low = RD4(sc, ETH_SA1L); high = RD4(sc, ETH_SA1H); @@ -595,6 +607,7 @@ ate_intr(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; int status; int i; void *bp; @@ -614,15 +627,18 @@ rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { printf("ignoring bogus 0 len packet\n"); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); continue; } /* Flush memory for mbuf so we don't get stale bytes */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); // XXX WHY? XXX imp + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + /* * The length returned by the device includes the * ethernet CRC calculation for the packet, but @@ -630,25 +646,37 @@ */ mb = m_devget(sc->rx_buf[i], (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN, - ETHER_ALIGN, sc->ifp, NULL); + ETHER_ALIGN, ifp, NULL); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); - if (mb != NULL) - (*sc->ifp->if_input)(sc->ifp, mb); + if (mb != NULL) { + ifp->if_ipackets++; + (*ifp->if_input)(ifp, mb); + } + } } if (status & ETH_ISR_TCOM) { ATE_LOCK(sc); + /* XXX TSR register should be cleared */ if (sc->sent_mbuf[0]) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[0], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[0]); + ifp->if_opackets++; sc->sent_mbuf[0] = NULL; } if (sc->sent_mbuf[1]) { if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[1], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[1]); + ifp->if_opackets++; sc->txcur = 0; sc->sent_mbuf[0] = sc->sent_mbuf[1] = NULL; } else { @@ -684,6 +712,7 @@ { struct ate_softc *sc = xsc; struct ifnet *ifp = sc->ifp; + struct mii_data *mii; ATE_ASSERT_LOCKED(sc); @@ -731,6 +760,10 @@ */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + + mii = device_get_softc(sc->miibus); + mii_pollstat(mii); + ate_stat_update(sc, mii->mii_media_active); atestart_locked(ifp); callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -745,7 +778,7 @@ struct ate_softc *sc = ifp->if_softc; struct mbuf *m, *mdefrag; bus_dma_segment_t segs[1]; - int nseg; + int nseg, e; ATE_ASSERT_LOCKED(sc); if (ifp->if_drv_flags & IFF_DRV_OACTIVE) @@ -767,14 +800,19 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; } - mdefrag = m_defrag(m, M_DONTWAIT); - if (mdefrag == NULL) { - IFQ_DRV_PREPEND(&ifp->if_snd, m); - return; + e = bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, + segs, &nseg, 0); + if (e == EFBIG) { + mdefrag = m_defrag(m, M_DONTWAIT); + if (mdefrag == NULL) { + IFQ_DRV_PREPEND(&ifp->if_snd, m); + return; + } + m = mdefrag; + e = bus_dmamap_load_mbuf_sg(sc->mtag, + sc->tx_map[sc->txcur], m, segs, &nseg, 0); } - m = mdefrag; - if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, - segs, &nseg, 0) != 0) { + if (e != 0) { m_freem(m); continue; } ==== //depot/projects/trustedbsd/priv/sys/boot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/trustedbsd/priv/sys/boot/common/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.22 2006/05/12 04:09:52 jhb Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.23 2006/11/02 00:26:44 marcel Exp $ -SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c +SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c @@ -19,6 +19,10 @@ SRCS+= dev_net.c .endif +.if defined(HAVE_BCACHE) +SRCS+= bcache.c +.endif + # Machine-independant ISA PnP .if defined(HAVE_ISABUS) SRCS+= isapnp.c ==== //depot/projects/trustedbsd/priv/sys/boot/common/bootstrap.h#2 (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/boot/common/bootstrap.h,v 1.42 2005/12/18 04:52:35 marcel Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.43 2006/11/02 01:23:17 marcel Exp $ */ #include @@ -43,6 +43,7 @@ #define DEVT_DISK 1 #define DEVT_NET 2 #define DEVT_CD 3 + int d_unit; }; /* Commands and return values; nonzero return sets command_errmsg != NULL */ ==== //depot/projects/trustedbsd/priv/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $"); #include #include @@ -35,20 +35,25 @@ int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; + struct devdesc *dev; + int result; + + result = archsw.arch_getdev((void **)&dev, fname, file); + if (result) + return (result); - if ((result = archsw.arch_getdev((void *)&dev, fname, file)) == 0) { /* get the device */ - /* point to device-specific data so that device open can use it */ - f->f_devdata = dev; - if ((result = dev->d_dev->dv_open(f, dev)) == 0) { /* try to open it */ - /* reference the devsw entry from the open_file structure */ - f->f_dev = dev->d_dev; - } else { - free(dev); /* release the device descriptor */ - } + /* point to device-specific data so that device open can use it */ + f->f_devdata = dev; + result = dev->d_dev->dv_open(f, dev); + if (result != 0) { + f->f_devdata = NULL; + free(dev); + return (result); } - return(result); + + /* reference the devsw entry from the open_file structure */ + f->f_dev = dev->d_dev; + return (0); } int ==== //depot/projects/trustedbsd/priv/sys/boot/common/load_elf.c#3 (text+ko) ==== @@ -26,12 +26,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.35 2006/10/29 14:50:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.37 2006/11/02 17:52:43 ru Exp $"); #include #include #include #include +#include #include #include #include @@ -263,7 +264,7 @@ #if __ELF_WORD_SIZE == 64 off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ #else - off = - (off & 0xc0000000u); /* i386 relocates after locore */ + off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif #else off = 0; /* other archs use direct mapped kernels */ @@ -400,9 +401,9 @@ lastaddr += sizeof(size); #ifdef ELF_VERBOSE - printf("\n%s: 0x%lx@0x%lx -> 0x%lx-0x%lx", secname, - shdr[i].sh_size, shdr[i].sh_offset, - lastaddr, lastaddr + shdr[i].sh_size); + printf("\n%s: 0x%jx@0x%jx -> 0x%jx-0x%jx", secname, + (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset, + (uintmax_t)lastaddr, (uintmax_t)(lastaddr + shdr[i].sh_size)); #else if (i == symstrindex) printf("+"); ==== //depot/projects/trustedbsd/priv/sys/boot/efi/include/efi.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ -/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.4 2006/11/02 02:42:47 marcel Exp $ */ /*++ -Copyright (c) 1998 Intel Corporation >>> TRUNCATED FOR MAIL (1000 lines) <<<