|
|
http://perforce.freebsd.org/chv.cgi?CH=118679
Change 118679 by rwatson@rwatson_cinnamon on 2007/04/23 20:42:18
Integrate TrustedBSD priv branch from TrustedBSD base branch.
Affected files ...
.. //depot/projects/trustedbsd/priv/sys/Makefile#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#6
integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#9
integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_sim.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_sim.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt_periph.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ch.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_low.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pass.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pt.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sa.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ses.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_targ_bh.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_socket.c#4 integrate
..
//depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_misc.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_vfs.c#2
integrate
.. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/misc.h#2
integrate
.. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/types.h#2
integrate
.. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/vnode.h#2
integrate
.. //depot/projects/trustedbsd/priv/sys/conf/NOTES#12 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files#14 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/options#9 integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2
integrate
..
//depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2
integrate
.. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/if_pfsync.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_cam.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/advansys/advansys.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/advansys/adwcam.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aha/aha.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ahb/ahb.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic/aic.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/amd/amd.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/amr/amr_cam.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/asr/asr.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cam.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/buslogic/bt.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_scsi.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/esp/ncr53c9x.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ex/if_exvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdma.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp_targ.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/hptmv/entry.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_mod.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/iicbus/icee.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/iir/iir.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/led/led.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/led/led.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ppbus/vpo.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/rr232x/osm_bsd.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ess.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb16.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb8.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/cmi.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ich.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/maestro3.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/sbus/cs4231.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sym/sym_hipd.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/trm/trm.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_cam.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/wds/wd7000.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/wi/if_wi.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_devs.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_fpregs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_regs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_fileno.c#2
integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_internal.h#2
integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_vncache.c#4
integrate
.. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/vinum/geom_vinum_share.c#2
integrate
.. //depot/projects/trustedbsd/priv/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/bios.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/identcpu.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/vmparam.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/isa/isa_common.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#19 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_linker.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_rman.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#10 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#12 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/Makefile#10 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/if_lagg/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/if_trunk/Makefile#2 delete
.. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_lagg.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/net/if_lagg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/net/if_trunk.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/net/if_trunk.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/net/if_var.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#11 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_lock_bsd.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#10 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/ipsec.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/route6.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netnatm/natm.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_syscalls.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_vr.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_vrreg.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/intpm.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/ncr.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/nexus.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#10 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#5
integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#5
integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#9
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_audit.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#8 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_net.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_process.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_socket.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#7 integrate
..
//depot/projects/trustedbsd/priv/sys/security/mac_bsdextended/mac_bsdextended.c#7
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_ifoff/mac_ifoff.c#5
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#8
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#6 integrate
..
//depot/projects/trustedbsd/priv/sys/security/mac_partition/mac_partition.c#7
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#9
integrate
..
//depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#9
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_stub/mac_stub.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/interrupt.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#9 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mount.h#8 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/priv.h#14 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/proc.h#7 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/socket.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_param.h#2 integrate
Differences ...
==== //depot/projects/trustedbsd/priv/sys/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $
.include <bsd.own.mk>
@@ -8,10 +8,10 @@
.endif
# Directories to include in cscope name file and TAGS.
-CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \
- isa kern libkern modules net net80211 netatalk netatm \
+CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
+ i4b isa kern libkern modules net net80211 netatalk netatm \
netgraph netinet netinet6 netipx netkey netnatm netncp \
- netsmb nfs nfsclient nfs4client rpc pccard pci sys \
+ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
ufs vm ${ARCHDIR}
ARCHDIR ?= ${MACHINE}
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#4
(text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.79 2007/03/06
18:28:42 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17
21:05:34 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,7 @@
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/md_var.h>
+#include <machine/specialreg.h>
#define MAX_BPAGES 8192
@@ -522,6 +523,9 @@
} else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) {
printf("bus_dmamem_alloc failed to align memory properly.\n");
}
+ if (flags & BUS_DMA_NOCACHE)
+ pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize,
+ PAT_UNCACHEABLE);
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
__func__, dmat, dmat->flags, ENOMEM);
return (0);
@@ -540,6 +544,7 @@
*/
if (map != NULL)
panic("bus_dmamem_free: Invalid map freed\n");
+ pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, PAT_WRITE_BACK);
if ((dmat->maxsize <= PAGE_SIZE) &&
(dmat->alignment < dmat->maxsize) &&
dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem))
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#6 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.581 2007/03/10 20:26:43 alc
Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.583 2007/04/21 14:17:29 ups
Exp $");
/*
* Manages physical address maps.
@@ -209,7 +209,7 @@
static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
vm_page_t m, vm_prot_t prot, vm_page_t mpte);
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq,
- vm_offset_t sva, pd_entry_t ptepde);
+ vm_offset_t sva, pd_entry_t ptepde, vm_page_t *free);
static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde);
static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
vm_offset_t va);
@@ -221,8 +221,9 @@
static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, int flags);
-static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m);
-static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t);
+static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m,
+ vm_page_t* free);
+static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, vm_page_t *);
static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t));
@@ -1065,24 +1066,36 @@
/***************************************************
* Page table page management routines.....
***************************************************/
+static PMAP_INLINE void
+pmap_free_zero_pages(vm_page_t free)
+{
+ vm_page_t m;
+ while (free != NULL) {
+ m = free;
+ free = m->right;
+ vm_page_free_zero(m);
+ }
+}
+
/*
* This routine unholds page table pages, and if the hold count
* drops to zero, then it decrements the wire count.
*/
static PMAP_INLINE int
-pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
+pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free)
{
--m->wire_count;
if (m->wire_count == 0)
- return _pmap_unwire_pte_hold(pmap, va, m);
+ return _pmap_unwire_pte_hold(pmap, va, m, free);
else
return 0;
}
static int
-_pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
+_pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m,
+ vm_page_t *free)
{
vm_offset_t pteva;
@@ -1114,14 +1127,14 @@
vm_page_t pdpg;
pdpg = PHYS_TO_VM_PAGE(*pmap_pdpe(pmap, va) & PG_FRAME);
- pmap_unwire_pte_hold(pmap, va, pdpg);
+ pmap_unwire_pte_hold(pmap, va, pdpg, free);
}
if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) {
/* We just released a PD, unhold the matching PDP */
vm_page_t pdppg;
pdppg = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, va) & PG_FRAME);
- pmap_unwire_pte_hold(pmap, va, pdppg);
+ pmap_unwire_pte_hold(pmap, va, pdppg, free);
}
/*
@@ -1130,7 +1143,13 @@
*/
pmap_invalidate_page(pmap, pteva);
- vm_page_free_zero(m);
+ /*
+ * Put page on a list so that it is released after
+ * *ALL* TLB shootdown is done
+ */
+ m->right = *free;
+ *free = m;
+
atomic_subtract_int(&cnt.v_wire_count, 1);
return 1;
}
@@ -1140,7 +1159,7 @@
* conditionally free the page, and manage the hold/wire counts.
*/
static int
-pmap_unuse_pt(pmap_t pmap, vm_offset_t va, pd_entry_t ptepde)
+pmap_unuse_pt(pmap_t pmap, vm_offset_t va, pd_entry_t ptepde, vm_page_t *free)
{
vm_page_t mpte;
@@ -1148,7 +1167,7 @@
return 0;
KASSERT(ptepde != 0, ("pmap_unuse_pt: ptepde != 0"));
mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME);
- return pmap_unwire_pte_hold(pmap, va, mpte);
+ return pmap_unwire_pte_hold(pmap, va, mpte, free);
}
void
@@ -1366,7 +1385,7 @@
{
vm_pindex_t ptepindex;
pd_entry_t *pd;
- vm_page_t m;
+ vm_page_t m, free;
KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
(flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
@@ -1390,8 +1409,10 @@
*pd = 0;
pd = 0;
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va));
+ free = NULL;
+ pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va), &free);
pmap_invalidate_all(kernel_pmap);
+ pmap_free_zero_pages(free);
}
/*
@@ -1609,7 +1630,7 @@
pt_entry_t *pte, tpte;
pv_entry_t next_pv, pv;
vm_offset_t va;
- vm_page_t m;
+ vm_page_t m, free;
TAILQ_FOREACH(m, &vpq->pl, pageq) {
if (m->hold_count || m->busy)
@@ -1635,12 +1656,14 @@
va, tpte));
vm_page_dirty(m);
}
+ free = NULL;
+ pmap_unuse_pt(pmap, va, ptepde, &free);
pmap_invalidate_page(pmap, va);
+ pmap_free_zero_pages(free);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
m->md.pv_list_count--;
- pmap_unuse_pt(pmap, va, ptepde);
free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
@@ -1833,7 +1856,8 @@
* pmap_remove_pte: do the things to unmap a page in a process
*/
static int
-pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, pd_entry_t
ptepde)
+pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va,
+ pd_entry_t ptepde, vm_page_t *free)
{
pt_entry_t oldpte;
vm_page_t m;
@@ -1861,7 +1885,7 @@
vm_page_flag_set(m, PG_REFERENCED);
pmap_remove_entry(pmap, m, va);
}
- return (pmap_unuse_pt(pmap, va, ptepde));
+ return (pmap_unuse_pt(pmap, va, ptepde, free));
}
/*
@@ -1871,6 +1895,7 @@
pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde)
{
pt_entry_t *pte;
+ vm_page_t free = NULL;
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
if ((*pde & PG_V) == 0)
@@ -1878,8 +1903,9 @@
pte = pmap_pde_to_pte(pde, va);
if ((*pte & PG_V) == 0)
return;
- pmap_remove_pte(pmap, pte, va, *pde);
+ pmap_remove_pte(pmap, pte, va, *pde, &free);
pmap_invalidate_page(pmap, va);
+ pmap_free_zero_pages(free);
}
/*
@@ -1896,6 +1922,7 @@
pdp_entry_t *pdpe;
pd_entry_t ptpaddr, *pde;
pt_entry_t *pte;
+ vm_page_t free = NULL;
int anyvalid;
/*
@@ -1959,7 +1986,7 @@
if ((ptpaddr & PG_PS) != 0) {
*pde = 0;
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pmap_unuse_pt(pmap, sva, *pdpe);
+ pmap_unuse_pt(pmap, sva, *pdpe, &free);
anyvalid = 1;
continue;
}
@@ -1983,14 +2010,16 @@
*/
if ((*pte & PG_G) == 0)
anyvalid = 1;
- if (pmap_remove_pte(pmap, pte, sva, ptpaddr))
+ if (pmap_remove_pte(pmap, pte, sva, ptpaddr, &free))
break;
}
}
out:
- vm_page_unlock_queues();
- if (anyvalid)
+ if (anyvalid) {
pmap_invalidate_all(pmap);
+ pmap_free_zero_pages(free);
+ }
+ vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
}
@@ -2014,6 +2043,7 @@
pmap_t pmap;
pt_entry_t *pte, tpte;
pd_entry_t ptepde;
+ vm_page_t free;
#if defined(PMAP_DIAGNOSTIC)
/*
@@ -2045,10 +2075,12 @@
pv->pv_va, tpte));
vm_page_dirty(m);
}
+ free = NULL;
+ pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free);
pmap_invalidate_page(pmap, pv->pv_va);
+ pmap_free_zero_pages(free);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count--;
- pmap_unuse_pt(pmap, pv->pv_va, ptepde);
free_pv_entry(pmap, pv);
PMAP_UNLOCK(pmap);
}
@@ -2161,9 +2193,9 @@
}
}
}
- vm_page_unlock_queues();
if (anychanged)
pmap_invalidate_all(pmap);
+ vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
}
@@ -2413,6 +2445,7 @@
pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
vm_prot_t prot, vm_page_t mpte)
{
+ vm_page_t free;
pt_entry_t *pte;
vm_paddr_t pa;
@@ -2471,7 +2504,7 @@
pte = vtopte(va);
if (*pte) {
if (mpte != NULL) {
- pmap_unwire_pte_hold(pmap, va, mpte);
+ mpte->wire_count--;
mpte = NULL;
}
return (mpte);
@@ -2483,7 +2516,11 @@
if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 &&
!pmap_try_insert_pv_entry(pmap, va, m)) {
if (mpte != NULL) {
- pmap_unwire_pte_hold(pmap, va, mpte);
+ free = NULL;
+ if (pmap_unwire_pte_hold(pmap, va, mpte, &free)) {
+ pmap_invalidate_page(pmap, va);
+ pmap_free_zero_pages(free);
+ }
mpte = NULL;
}
return (mpte);
@@ -2657,6 +2694,7 @@
pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t
len,
vm_offset_t src_addr)
{
+ vm_page_t free;
vm_offset_t addr;
vm_offset_t end_addr = src_addr + len;
vm_offset_t va_next;
@@ -2716,7 +2754,7 @@
dst_pmap->pm_stats.resident_count +=
NBPDR / PAGE_SIZE;
} else
- pmap_unwire_pte_hold(dst_pmap, addr, dstmpde);
+ dstmpde->wire_count--;
continue;
}
@@ -2753,9 +2791,15 @@
*dst_pte = ptetemp & ~(PG_W | PG_M |
PG_A);
dst_pmap->pm_stats.resident_count++;
- } else
- pmap_unwire_pte_hold(dst_pmap, addr,
- dstmpte);
+ } else {
+ free = NULL;
+ if (pmap_unwire_pte_hold(dst_pmap,
+ addr, dstmpte, &free)) {
+ pmap_invalidate_page(dst_pmap,
+ addr);
+ pmap_free_zero_pages(free);
+ }
+ }
if (dstmpte->wire_count >= srcmpte->wire_count)
break;
}
@@ -2866,7 +2910,7 @@
pmap_remove_pages(pmap_t pmap)
{
pt_entry_t *pte, tpte;
- vm_page_t m;
+ vm_page_t m, free = NULL;
pv_entry_t pv;
struct pv_chunk *pc, *npc;
int field, idx;
@@ -2939,7 +2983,7 @@
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
pmap_unuse_pt(pmap, pv->pv_va,
- *vtopde(pv->pv_va));
+ *vtopde(pv->pv_va), &free);
}
}
if (allfree) {
@@ -2952,8 +2996,9 @@
vm_page_free(m);
}
}
+ pmap_invalidate_all(pmap);
+ pmap_free_zero_pages(free);
vm_page_unlock_queues();
- pmap_invalidate_all(pmap);
PMAP_UNLOCK(pmap);
}
@@ -3261,7 +3306,7 @@
pd_entry_t *pde;
pt_entry_t *pte;
- base = va & PG_FRAME;
+ base = trunc_page(va);
offset = va & PAGE_MASK;
size = roundup(offset + size, PAGE_SIZE);
==== //depot/projects/trustedbsd/priv/sys/amd64/include/vmparam.h#2 (text+ko)
====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter
Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.46 2007/04/21 01:14:47
sepotvin Exp $
*/
@@ -122,7 +122,8 @@
/*
* How many physical pages per KVA page allocated.
- * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX)
+ * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
+ * VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
* is the total KVA space allocated for kmem_map.
*/
#ifndef VM_KMEM_SIZE_SCALE
==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#6
(text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29
02:11:46 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18
18:08:12 jkim Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,6 @@
DUMMY(mincore);
DUMMY(fadvise64);
DUMMY(ptrace);
-DUMMY(settimeofday);
DUMMY(lookup_dcookie);
DUMMY(epoll_create);
DUMMY(epoll_ctl);
==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#9
(text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30
17:27:13 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18
20:12:05 jkim Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -252,7 +252,7 @@
if (iovcnt > UIO_MAXIOV)
return (EINVAL);
iovlen = iovcnt * sizeof(struct iovec);
- uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK);
+ uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
iov = (struct iovec *)(uio + 1);
for (i = 0; i < iovcnt; i++) {
error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
@@ -526,7 +526,9 @@
td2 = FIRST_THREAD_IN_PROC(p2);
- /* make it run */
+ /*
+ * Make this runnable after we are finished with it.
+ */
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
sched_add(td2, SRQ_BORING);
@@ -572,8 +574,8 @@
/*
* XXX: In Linux, sharing of fs info (chroot/cwd/umask)
* and open files is independant. In FreeBSD, its in one
- * structure but in reality it does not make any problems
- * because both of these flags are set at once usually.
+ * structure but in reality it does not cause any problems
+ * because both of these flags are usually set together.
*/
if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS)))
ff |= RFFDG;
@@ -660,15 +662,15 @@
if (args->flags & LINUX_CLONE_SETTLS) {
struct user_segment_descriptor sd;
struct l_user_desc info;
- int a[2];
+ int a[2];
- error = copyin((void *)td->td_frame->tf_rsi, &info,
+ error = copyin((void *)td->td_frame->tf_rsi, &info,
sizeof(struct l_user_desc));
if (error) {
printf(LMSG("copyin failed!"));
} else {
/* We might copy out the entry_number as GUGS32_SEL. */
- info.entry_number = GUGS32_SEL;
+ info.entry_number = GUGS32_SEL;
error = copyout(&info, (void *)td->td_frame->tf_rsi,
sizeof(struct l_user_desc));
if (error)
@@ -871,7 +873,7 @@
*
* Our mmap with MAP_STACK takes addr as the maximum
* downsize limit on BOS, and as len the max size of
- * the region. It them maps the top SGROWSIZ bytes,
+ * the region. It then maps the top SGROWSIZ bytes,
* and auto grows the region down, up to the limit
* in addr.
*
@@ -1167,17 +1169,44 @@
microtime(&atv);
atv32.tv_sec = atv.tv_sec;
atv32.tv_usec = atv.tv_usec;
- error = copyout(&atv32, uap->tp, sizeof (atv32));
+ error = copyout(&atv32, uap->tp, sizeof(atv32));
}
if (error == 0 && uap->tzp != NULL) {
rtz.tz_minuteswest = tz_minuteswest;
rtz.tz_dsttime = tz_dsttime;
- error = copyout(&rtz, uap->tzp, sizeof (rtz));
+ error = copyout(&rtz, uap->tzp, sizeof(rtz));
}
return (error);
}
int
+linux_settimeofday(struct thread *td, struct linux_settimeofday_args *uap)
+{
+ l_timeval atv32;
+ struct timeval atv, *tvp;
+ struct timezone atz, *tzp;
+ int error;
+
+ if (uap->tp) {
+ error = copyin(uap->tp, &atv32, sizeof(atv32));
+ if (error)
+ return (error);
+ atv.tv_sec = atv32.tv_sec;
+ atv.tv_usec = atv32.tv_usec;
+ tvp = &atv;
+ } else
+ tvp = NULL;
+ if (uap->tzp) {
+ error = copyin(uap->tzp, &atz, sizeof(atz));
+ if (error)
+ return (error);
+ tzp = &atz;
+ } else
+ tzp = NULL;
+ return (kern_settimeofday(td, tvp, tzp));
+}
+
+int
linux_getrusage(struct thread *td, struct linux_getrusage_args *uap)
{
struct l_rusage s32;
@@ -1242,7 +1271,7 @@
#ifdef DEBUG
if (ldebug(set_thread_area))
- printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, "
+ printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, "
"%i, %i, %i"), info.entry_number, info.base_addr,
info.limit, info.seg_32bit, info.contents,
info.read_exec_only, info.limit_in_pages,
@@ -1261,9 +1290,10 @@
* The tls_array[] is used only in [gs]et_thread_area() syscalls and
* for loading the GDT descriptors. We use just one GDT descriptor
* for TLS, so we will load just one.
- * XXX: This doesnt work when user-space process tries to use more
+ *
+ * XXX: This doesn't work when a user space process tries to use more
* than one TLS segment. Comment in the Linux source says wine might
- * do that.
+ * do this.
*/
/*
@@ -1284,8 +1314,9 @@
/*
* We have to copy out the GDT entry we use.
- * XXX: What if userspace program does not check return value and
- * tries to use 6, 7 or 8?
+ *
+ * XXX: What if a user space program does not check the return value
+ * and tries to use 6, 7 or 8?
*/
error = copyout(&info, args->desc, sizeof(struct l_user_desc));
if (error)
==== //depot/projects/trustedbsd/priv/sys/bsm/audit.h#4 (text+ko) ====
@@ -30,8 +30,8 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/priv/sys/bsm/audit.h#3 $
- * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $
*/
#ifndef _BSM_AUDIT_H
==== //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#5 (text) ====
@@ -34,8 +34,8 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $
- * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson
Exp $
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16
+ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson
Exp $
*/
#ifndef _AUDIT_INTERNAL_H
==== //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#4 (text+ko) ====
@@ -30,8 +30,8 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#3 $
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp
$
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson
Exp $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -475,6 +475,28 @@
#define AUE_READDIR 43118 /* Linux. */
#define AUE_IOPL 43119 /* Linux. */
#define AUE_VM86 43120 /* Linux. */
+#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */
+#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */
+#define AUE_MAC_GET_FD 43123 /* FreeBSD. */
+#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */
+#define AUE_MAC_SET_FD 43125 /* FreeBSD. */
+#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */
+#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */
+#define AUE_MAC_GET_PID 43128 /* FreeBSD. */
+#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */
+#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */
+#define AUE_MAC_EXECVE 43131 /* FreeBSD. */
+#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */
+#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */
+#define AUE_MQ_OPEN 43134 /* FreeBSD. */
+#define AUE_MQ_SETATTR 43135 /* FreeBSD. */
+#define AUE_MQ_TIMEDRECEIVE 43136 /* FreeBSD. */
+#define AUE_MQ_TIMEDSEND 43137 /* FreeBSD. */
+#define AUE_MQ_NOTIFY 43138 /* FreeBSD. */
+#define AUE_MQ_UNLINK 43139 /* FreeBSD. */
+#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */
+#define AUE_MLOCKALL 43141 /* FreeBSD. */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
_______________________________________________
p4-projects@xxxxxxxxxxx mailing list
http://lists.freebsd.org/mailman/listinfo/p4-projects
To unsubscribe, send any mail to "p4-projects-unsubscribe@xxxxxxxxxxx"
|
|