PERFORCE change 125752 for review
Robert Watson
rwatson at FreeBSD.org
Mon Aug 27 12:17:50 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125752
Change 125752 by rwatson at rwatson_zoo on 2007/08/27 19:16:53
Integrate TrustedBSD mac2 branch further.
Affected files ...
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/cpu_switch.S#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/include/asm.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/include/asmacros.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/genassym.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91rm92reg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/at91/ohci_atmelarm.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/conf/CRB#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/include/pte.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_timer.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321var.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/crb_machdep.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/files.crb#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/files.i81342#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342_pci.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342_space.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342reg.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/i81342var.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/obio.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/obio_space.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/obiovar.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/std.crb#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/std.i81342#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/bsm/audit.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.arm#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/files#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/options#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/conf/options.ia64#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pfsync.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_hpet.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/adlink/adlink.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/aic7xxx/aic7xxx.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bcefw.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/coretemp/coretemp.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_l2t.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/dcons/dcons_os.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/isc_cam.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/isc_sm.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/isc_soc.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/isc_subr.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/iscsi.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/iscsi.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/iscsi/initiator/iscsivar.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/nfe/if_nfevar.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/nmdm/nmdm.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/streams/streams.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/ufoma.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/umodem.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/denode.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/support.s#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/include/asm.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/include/asmacros.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/clock.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/db_machdep.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/nexus.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/include/ia64_cpu.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/include/intr.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/ia64/include/sapicvar.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_cpu.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/subr_clock.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/uipc_domain.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#9 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/modules/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/modules/coretemp/Makefile#1 branch
.. //depot/projects/trustedbsd/mac2/sys/modules/iscsi/Makefile#1 branch
.. //depot/projects/trustedbsd/mac2/sys/modules/iscsi/initiator/Makefile#1 branch
.. //depot/projects/trustedbsd/mac2/sys/modules/netgraph/bluetooth/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#7 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/bpfdesc.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if_bridge.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if_bridgevar.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if_lagg.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/if_lagg.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/net/netisr.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_freebsd.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/netflow/netflow.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ppp.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ppp.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_carp.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_fsm.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.h#1 branch
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_timer.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_output.c#4 delete
.. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_var.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/netipx/spx_debug.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/pci/if_rl.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/pci/if_xl.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/pci/viapm.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/include/interruptvar.h#2 delete
.. //depot/projects/trustedbsd/mac2/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/include/md_var.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/include/trap.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powermac/hrowpicvar.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/autoconf.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/interrupt.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/nexus.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/pic_if.m#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/trap.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/rpc/rpcclnt.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/security/mac_mls/mac_mls.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/include/iommureg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/pci/psychoreg.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/sbus/sbusreg.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/eeprom.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/rtc.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/ata.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/kernel.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/mbuf.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/mutex.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/proc.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/thr.h#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/device_pager.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/phys_pager.c#3 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#7 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_map.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_map.h#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_meter.c#4 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#6 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vm_pager.c#2 integrate
.. //depot/projects/trustedbsd/mac2/sys/vm/vnode_pager.c#4 integrate
Differences ...
==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $
*/
#include <machine/asmacros.h>
@@ -81,6 +81,7 @@
movq PCB_CR3(%rdx),%rdx
movq %rdx,%cr3 /* new address space */
jmp swact
+END(cpu_throw)
/*
* cpu_switch(old, new, mtx)
@@ -256,7 +257,8 @@
movq %rax,%dr7
1:
ret
-
+END(cpu_switch)
+
/*
* savectx(pcb)
* Update pcb, saving current processor state.
@@ -314,3 +316,4 @@
popfq
ret
+END(savectx)
==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $");
#include "opt_hwpmc_hooks.h"
@@ -1060,10 +1060,6 @@
if (retval != 0)
printf("%s: Failed to setup the local APIC: returned %d\n",
best_enum->apic_name, retval);
-#ifdef SMP
- /* Last, setup the cpu topology now that we have probed CPUs */
- mp_topology();
-#endif
}
SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -186,26 +186,14 @@
mp_topology(void)
{
struct cpu_group *group;
- u_int regs[4];
- int logical_cpus;
int apic_id;
int groups;
int cpu;
/* Build the smp_topology map. */
/* Nothing to do if there is no HTT support. */
- if ((cpu_feature & CPUID_HTT) == 0)
+ if (hyperthreading_cpus <= 1)
return;
- logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
- if (logical_cpus <= 1)
- return;
- /* Nothing to do if reported cores are physical cores. */
- if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) {
- cpuid_count(4, 0, regs);
- if ((regs[0] & 0x1f) != 0 &&
- logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1)
- return;
- }
group = &mp_groups[0];
groups = 1;
for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
@@ -215,7 +203,8 @@
* If the current group has members and we're not a logical
* cpu, create a new group.
*/
- if (group->cg_count != 0 && (apic_id % logical_cpus) == 0) {
+ if (group->cg_count != 0 &&
+ (apic_id % hyperthreading_cpus) == 0) {
group++;
groups++;
}
@@ -420,6 +409,9 @@
}
set_interrupt_apic_ids();
+
+ /* Last, setup the cpu topology now that we have probed CPUs */
+ mp_topology();
}
==== //depot/projects/trustedbsd/mac2/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.589 2007/07/01 07:08:25 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $");
/*
* Manages physical address maps.
@@ -1722,7 +1722,7 @@
static const struct timeval printinterval = { 60, 0 };
static struct timeval lastprint;
static vm_pindex_t colour;
- int bit, field, page_req;
+ int bit, field;
pv_entry_t pv;
struct pv_chunk *pc;
vm_page_t m;
@@ -1755,8 +1755,7 @@
}
}
/* No free items, allocate another chunk */
- page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM;
- m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (try) {
pv_entry_count--;
@@ -1775,7 +1774,7 @@
PV_STAT(pmap_collect_inactive++);
pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
m = vm_page_alloc(NULL, colour,
- VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
+ VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
if (m == NULL) {
PV_STAT(pmap_collect_active++);
pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]);
==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#4 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $
*/
#include "opt_ddb.h"
@@ -69,7 +69,8 @@
rep
stosb
ret
-
+END(bzero)
+
/* Address: %rdi */
ENTRY(pagezero)
movq $-PAGE_SIZE,%rdx
@@ -84,6 +85,7 @@
jne 1b
sfence
ret
+END(pagezero)
ENTRY(bcmp)
movq %rdx,%rcx
@@ -101,6 +103,7 @@
setne %al
movsbl %al,%eax
ret
+END(bcmp)
/*
* bcopy(src, dst, cnt)
@@ -144,7 +147,8 @@
movsq
cld
ret
-
+END(bcopy)
+
/*
* Note: memcpy does not support overlapping copies
*/
@@ -159,6 +163,7 @@
rep
movsb
ret
+END(memcpy)
/*
* pagecopy(%rdi=from, %rsi=to)
@@ -185,6 +190,7 @@
jne 2b
sfence
ret
+END(pagecopy)
/* fillw(pat, base, cnt) */
/* %rdi,%rsi, %rdx */
@@ -196,6 +202,7 @@
rep
stosw
ret
+END(fillw)
/*****************************************************************************/
/* copyout and fubyte family */
@@ -267,6 +274,7 @@
movq $0,PCB_ONFAULT(%rdx)
movq $EFAULT,%rax
ret
+END(copyout)
/*
* copyin(from_user, to_kernel, len) - MP SAFE
@@ -312,6 +320,7 @@
movq $0,PCB_ONFAULT(%rdx)
movq $EFAULT,%rax
ret
+END(copyin)
/*
* casuword32. Compare and set user integer. Returns -1 or the current value.
@@ -340,6 +349,7 @@
movq PCPU(CURPCB),%rcx
movq $0,PCB_ONFAULT(%rcx)
ret
+END(casuword32)
/*
* casuword. Compare and set user word. Returns -1 or the current value.
@@ -369,6 +379,7 @@
movq $fusufault,PCB_ONFAULT(%rcx)
movq $0,PCB_ONFAULT(%rcx)
ret
+END(casuword)
/*
* Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit
@@ -388,6 +399,8 @@
movq (%rdi),%rax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword64)
+END(fuword)
ENTRY(fuword32)
movq PCPU(CURPCB),%rcx
@@ -400,6 +413,7 @@
movl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword32)
/*
* fuswintr() and suswintr() are specialized variants of fuword16() and
@@ -412,6 +426,8 @@
ENTRY(fuswintr)
movq $-1,%rax
ret
+END(suswintr)
+END(fuswintr)
ENTRY(fuword16)
movq PCPU(CURPCB),%rcx
@@ -424,6 +440,7 @@
movzwl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword16)
ENTRY(fubyte)
movq PCPU(CURPCB),%rcx
@@ -436,6 +453,7 @@
movzbl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fubyte)
ALIGN_TEXT
fusufault:
@@ -464,6 +482,8 @@
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword64)
+END(suword)
ENTRY(suword32)
movq PCPU(CURPCB),%rcx
@@ -478,6 +498,7 @@
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword32)
ENTRY(suword16)
movq PCPU(CURPCB),%rcx
@@ -492,6 +513,7 @@
movq PCPU(CURPCB),%rcx /* restore trashed register */
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword16)
ENTRY(subyte)
movq PCPU(CURPCB),%rcx
@@ -507,6 +529,7 @@
movq PCPU(CURPCB),%rcx /* restore trashed register */
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(subyte)
/*
* copyinstr(from, to, maxlen, int *lencopied) - MP SAFE
@@ -575,7 +598,7 @@
movq %r8,(%r9)
1:
ret
-
+END(copyinstr)
/*
* copystr(from, to, maxlen, int *lencopied) - MP SAFE
@@ -612,6 +635,7 @@
movq %r8,(%rcx)
7:
ret
+END(copystr)
/*
* Handling of special amd64 registers and descriptor tables etc
@@ -639,6 +663,7 @@
pushq %rax
MEXITCOUNT
lretq
+END(lgdt)
/*****************************************************************************/
/* setjump, longjump */
@@ -656,6 +681,7 @@
movq %rdx,56(%rdi) /* save rip */
xorl %eax,%eax /* return(0); */
ret
+END(setjmp)
ENTRY(longjmp)
movq 0(%rdi),%rbx /* restore rbx */
@@ -670,6 +696,7 @@
xorl %eax,%eax /* return(1); */
incl %eax
ret
+END(longjmp)
/*
* Support for BB-profiling (gcc -a). The kernbb program will extract
==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.318 2007/06/10 21:59:12 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319 2007/07/26 15:32:54 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -159,7 +159,8 @@
{
struct thread *td = curthread;
struct proc *p = td->td_proc;
- int i = 0, ucode = 0, type, code;
+ int i = 0, ucode = 0, code;
+ u_int type;
register_t addr = 0;
ksiginfo_t ksi;
@@ -622,7 +623,8 @@
struct trapframe *frame;
vm_offset_t eva;
{
- int code, type, ss;
+ int code, ss;
+ u_int type;
long esp;
struct soft_segment_descriptor softseg;
char *msg;
==== //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69 2007/08/15 19:26:02 des Exp $
#
#
@@ -446,6 +446,13 @@
#
device ichwd
+#
+# Temperature sensors:
+#
+# coretemp: on-die sensor on Intel Core and newer CPUs
+#
+device coretemp
+
#---------------------------------------------------------------------------
# ISDN4BSD
#
==== //depot/projects/trustedbsd/mac2/sys/amd64/include/asm.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90
- * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -77,6 +77,8 @@
#define ENTRY(x) _ENTRY(x)
#endif
+#define END(x) .size x, . - x
+
#define RCSID(x) .text; .asciz x
#undef __FBSDID
==== //depot/projects/trustedbsd/mac2/sys/amd64/include/asmacros.h#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $
+ * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $
*/
#ifndef _MACHINE_ASMACROS_H_
@@ -57,6 +57,8 @@
#define NON_GPROF_ENTRY(name) GEN_ENTRY(name)
#define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */
+#define END(name) .size name, . - name
+
#ifdef GPROF
/*
* __mcount is like [.]mcount except that doesn't require its caller to set
==== //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.40 2007/08/15 19:26:01 des Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -179,6 +179,7 @@
#define MSR_BIOS_SIGN 0x08b
#define MSR_PERFCTR0 0x0c1
#define MSR_PERFCTR1 0x0c2
+#define MSR_IA32_EXT_CONFIG 0x0ee /* Undocumented. Core Solo/Duo only */
#define MSR_MTRRcap 0x0fe
#define MSR_BBL_CR_ADDR 0x116
#define MSR_BBL_CR_DECC 0x118
==== //depot/projects/trustedbsd/mac2/sys/amd64/isa/clock.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $");
/*
* Routines to handle clock hardware.
@@ -686,8 +686,7 @@
return;
wrong_time:
- printf("Invalid time in real time clock.\n");
- printf("Check and reset the date immediately!\n");
+ printf("Invalid time in clock: check and reset the date!\n");
}
/*
==== //depot/projects/trustedbsd/mac2/sys/arm/arm/busdma_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.33 2007/06/10 12:33:01 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.35 2007/08/18 16:47:28 cognet Exp $");
/*
* ARM bus dma support routines
@@ -763,8 +763,12 @@
if (__predict_true(pmap == pmap_kernel())) {
(void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep);
if (__predict_false(pmap_pde_section(pde))) {
- curaddr = (*pde & L1_S_FRAME) |
- (vaddr & L1_S_OFFSET);
+ if (*pde & L1_S_SUPERSEC)
+ curaddr = (*pde & L1_SUP_FRAME) |
+ (vaddr & L1_SUP_OFFSET);
+ else
+ curaddr = (*pde & L1_S_FRAME) |
+ (vaddr & L1_S_OFFSET);
if (*pde & L1_S_CACHE_MASK) {
map->flags &=
~DMAMAP_COHERENT;
@@ -1087,36 +1091,42 @@
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
- if (op & BUS_DMASYNC_PREWRITE)
+ if ((op & BUS_DMASYNC_PREWRITE) && !(op & BUS_DMASYNC_PREREAD)) {
cpu_dcache_wb_range((vm_offset_t)buf, len);
+ cpu_l2cache_wb_range((vm_offset_t)buf, len);
+ }
+ if (op & BUS_DMASYNC_PREREAD) {
+ if ((op & BUS_DMASYNC_PREWRITE) ||
+ ((((vm_offset_t)(buf) | len) & arm_dcache_align_mask) == 0)) {
+ cpu_dcache_inv_range((vm_offset_t)buf, len);
+ cpu_l2cache_inv_range((vm_offset_t)buf, len);
+ } else {
+ cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+ }
+ }
if (op & BUS_DMASYNC_POSTREAD) {
- if ((vm_offset_t)buf & arm_dcache_align_mask)
+ if ((vm_offset_t)buf & arm_dcache_align_mask) {
memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_clend, (void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ (vm_offset_t)buf & arm_dcache_align_mask);
+ }
+ if (((vm_offset_t)buf + len) & arm_dcache_align_mask) {
+ memcpy(_tmp_clend, (void *)((vm_offset_t)buf + len),
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
+ }
cpu_dcache_inv_range((vm_offset_t)buf, len);
+ cpu_l2cache_inv_range((vm_offset_t)buf, len);
+
if ((vm_offset_t)buf & arm_dcache_align_mask)
memcpy((void *)((vm_offset_t)buf &
- ~arm_dcache_align_mask),
- _tmp_cl,
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
+ ~arm_dcache_align_mask), _tmp_cl,
+ (vm_offset_t)buf & arm_dcache_align_mask);
if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy((void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask), _tmp_clend,
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ memcpy((void *)((vm_offset_t)buf + len), _tmp_clend,
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
}
}
@@ -1131,14 +1141,20 @@
(void *)(bpage->vaddr_nocache != 0 ?
bpage->vaddr_nocache : bpage->vaddr),
bpage->datacount);
- if (bpage->vaddr_nocache == 0)
+ if (bpage->vaddr_nocache == 0) {
cpu_dcache_wb_range(bpage->vaddr,
bpage->datacount);
+ cpu_l2cache_wb_range(bpage->vaddr,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list