Date: Sun, 25 May 2008 00:16:31 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 142231 for review Message-ID: <200805250016.m4P0GVLu010417@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142231 Change 142231 by marcel@marcel_xcllnt on 2008/05/25 00:15:43 IFC @142229 Affected files ... .. //depot/projects/usiii/Makefile#3 integrate .. //depot/projects/usiii/amd64/amd64/exception.S#3 integrate .. //depot/projects/usiii/amd64/amd64/genassym.c#5 integrate .. //depot/projects/usiii/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/usiii/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/usiii/amd64/amd64/pmap.c#7 integrate .. //depot/projects/usiii/amd64/amd64/trap.c#4 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#10 integrate .. //depot/projects/usiii/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/usiii/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/usiii/arm/arm/identcpu.c#3 integrate .. //depot/projects/usiii/arm/arm/pmap.c#6 integrate .. //depot/projects/usiii/boot/forth/loader.conf#4 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/usiii/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch .. //depot/projects/usiii/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch .. //depot/projects/usiii/cddl/dev/cyclic/cyclic.c#1 branch .. //depot/projects/usiii/cddl/dev/cyclic/cyclic_test.c#1 branch .. //depot/projects/usiii/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch .. //depot/projects/usiii/cddl/dev/dtmalloc/dtmalloc.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/dis_tables.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/dis_tables.h#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/amd64/instr_size.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_anon.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_cddl.h#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_clone.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_debug.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_hacks.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_ioctl.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_load.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_modevent.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_sysctl.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_test.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_unload.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_vtime.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/dis_tables.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/dis_tables.h#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch .. //depot/projects/usiii/cddl/dev/dtrace/i386/instr_size.c#1 branch .. //depot/projects/usiii/cddl/dev/fbt/fbt.c#1 branch .. //depot/projects/usiii/cddl/dev/profile/profile.c#1 branch .. //depot/projects/usiii/cddl/dev/prototype.c#1 branch .. //depot/projects/usiii/cddl/dev/sdt/sdt.c#1 branch .. //depot/projects/usiii/cddl/dev/systrace/systrace.c#1 branch .. //depot/projects/usiii/compat/linux/linux_emul.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_emul.h#2 integrate .. //depot/projects/usiii/compat/linux/linux_futex.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_futex.h#3 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#6 integrate .. //depot/projects/usiii/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/usiii/conf/Makefile.amd64#3 integrate .. //depot/projects/usiii/conf/NOTES#11 integrate .. //depot/projects/usiii/conf/files#12 integrate .. //depot/projects/usiii/conf/kern.mk#3 integrate .. //depot/projects/usiii/conf/kern.post.mk#3 integrate .. //depot/projects/usiii/conf/kern.pre.mk#3 integrate .. //depot/projects/usiii/conf/options#11 integrate .. //depot/projects/usiii/conf/options.amd64#4 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pf.c#4 integrate .. //depot/projects/usiii/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/usiii/dev/age/if_age.c#1 branch .. //depot/projects/usiii/dev/age/if_agereg.h#1 branch .. //depot/projects/usiii/dev/age/if_agevar.h#1 branch .. //depot/projects/usiii/dev/ath/if_ath.c#8 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#11 integrate .. //depot/projects/usiii/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/usiii/dev/ciss/ciss.c#5 integrate .. //depot/projects/usiii/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/usiii/dev/em/if_em.c#7 integrate .. //depot/projects/usiii/dev/firewire/firewire.c#3 integrate .. //depot/projects/usiii/dev/firewire/fwohci.c#2 integrate .. //depot/projects/usiii/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/usiii/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/usiii/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/usiii/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/usiii/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/usiii/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/usiii/dev/ixgbe/README#1 branch .. //depot/projects/usiii/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/usiii/dev/ixgbe/tcp_lro.c#1 branch .. //depot/projects/usiii/dev/ixgbe/tcp_lro.h#1 branch .. //depot/projects/usiii/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/usiii/dev/malo/if_malo.c#3 integrate .. //depot/projects/usiii/dev/mfi/mfi.c#4 integrate .. //depot/projects/usiii/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/usiii/dev/mii/atphy.c#1 branch .. //depot/projects/usiii/dev/mii/atphyreg.h#1 branch .. //depot/projects/usiii/dev/mii/miidevs#7 integrate .. //depot/projects/usiii/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/usiii/dev/puc/pucdata.c#3 integrate .. //depot/projects/usiii/dev/ral/rt2560.c#8 integrate .. //depot/projects/usiii/dev/ral/rt2661.c#8 integrate .. //depot/projects/usiii/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/usiii/dev/speaker/spkr.c#3 integrate .. //depot/projects/usiii/dev/sym/sym_defs.h#2 integrate .. //depot/projects/usiii/dev/sym/sym_fw.h#2 integrate .. //depot/projects/usiii/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/usiii/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/usiii/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/usiii/dev/usb/ehci.c#6 integrate .. //depot/projects/usiii/dev/usb/if_axe.c#5 integrate .. //depot/projects/usiii/dev/usb/if_rum.c#10 integrate .. //depot/projects/usiii/dev/usb/if_ural.c#6 integrate .. //depot/projects/usiii/dev/usb/if_zyd.c#9 integrate .. //depot/projects/usiii/dev/usb/ohci.c#3 integrate .. //depot/projects/usiii/dev/usb/uipaq.c#5 integrate .. //depot/projects/usiii/dev/usb/umass.c#4 integrate .. //depot/projects/usiii/dev/usb/usb.c#3 integrate .. //depot/projects/usiii/dev/usb/usbdevs#11 integrate .. //depot/projects/usiii/dev/usb/uscanner.c#5 integrate .. //depot/projects/usiii/dev/usb/uxb360gp_rdesc.h#2 integrate .. //depot/projects/usiii/dev/wi/if_wi.c#6 integrate .. //depot/projects/usiii/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/usiii/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/usiii/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/usiii/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/usiii/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/usiii/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/usiii/geom/geom_subr.c#3 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/usiii/i386/conf/GENERIC#10 integrate .. //depot/projects/usiii/i386/i386/exception.s#3 integrate .. //depot/projects/usiii/i386/i386/genassym.c#4 integrate .. //depot/projects/usiii/i386/i386/identcpu.c#4 integrate .. //depot/projects/usiii/i386/i386/local_apic.c#4 integrate .. //depot/projects/usiii/i386/i386/pmap.c#6 integrate .. //depot/projects/usiii/i386/i386/trap.c#5 integrate .. //depot/projects/usiii/i386/isa/clock.c#6 integrate .. //depot/projects/usiii/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/usiii/i386/linux/linux_proto.h#4 integrate .. //depot/projects/usiii/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/usiii/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/usiii/i386/linux/syscalls.master#4 integrate .. //depot/projects/usiii/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/usiii/ia64/ia64/machdep.c#9 integrate .. //depot/projects/usiii/ia64/ia64/pmap.c#7 integrate .. //depot/projects/usiii/kern/imgact_elf.c#5 integrate .. //depot/projects/usiii/kern/init_sysent.c#7 integrate .. //depot/projects/usiii/kern/kern_conf.c#4 integrate .. //depot/projects/usiii/kern/kern_ctf.c#1 branch .. //depot/projects/usiii/kern/kern_descrip.c#9 integrate .. //depot/projects/usiii/kern/kern_dtrace.c#1 branch .. //depot/projects/usiii/kern/kern_event.c#4 integrate .. //depot/projects/usiii/kern/kern_exec.c#7 integrate .. //depot/projects/usiii/kern/kern_exit.c#6 integrate .. //depot/projects/usiii/kern/kern_fork.c#6 integrate .. //depot/projects/usiii/kern/kern_linker.c#6 integrate .. //depot/projects/usiii/kern/kern_lockf.c#3 integrate .. //depot/projects/usiii/kern/kern_malloc.c#3 integrate .. //depot/projects/usiii/kern/kern_proc.c#7 integrate .. //depot/projects/usiii/kern/kern_sdt.c#1 branch .. //depot/projects/usiii/kern/kern_sig.c#7 integrate .. //depot/projects/usiii/kern/kern_switch.c#6 integrate .. //depot/projects/usiii/kern/kern_sx.c#5 integrate .. //depot/projects/usiii/kern/link_elf.c#5 integrate .. //depot/projects/usiii/kern/link_elf_obj.c#5 integrate .. //depot/projects/usiii/kern/linker_if.m#3 integrate .. //depot/projects/usiii/kern/subr_bus.c#7 integrate .. //depot/projects/usiii/kern/subr_lock.c#6 integrate .. //depot/projects/usiii/kern/subr_param.c#3 integrate .. //depot/projects/usiii/kern/subr_smp.c#8 integrate .. //depot/projects/usiii/kern/subr_witness.c#10 integrate .. //depot/projects/usiii/kern/sys_pipe.c#4 integrate .. //depot/projects/usiii/kern/sys_socket.c#4 integrate .. //depot/projects/usiii/kern/syscalls.c#7 integrate .. //depot/projects/usiii/kern/syscalls.master#8 integrate .. //depot/projects/usiii/kern/systrace_args.c#7 integrate .. //depot/projects/usiii/kern/tty.c#4 integrate .. //depot/projects/usiii/kern/tty_cons.c#4 integrate .. //depot/projects/usiii/kern/tty_subr.c#3 integrate .. //depot/projects/usiii/kern/uipc_sem.c#4 integrate .. //depot/projects/usiii/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/usiii/kern/uipc_socket.c#6 integrate .. //depot/projects/usiii/kern/uipc_syscalls.c#7 integrate .. //depot/projects/usiii/kern/vfs_export.c#2 integrate .. //depot/projects/usiii/kern/vfs_mount.c#9 integrate .. //depot/projects/usiii/kern/vfs_subr.c#10 integrate .. //depot/projects/usiii/mips/mips/pmap.c#3 integrate .. //depot/projects/usiii/modules/Makefile#11 integrate .. //depot/projects/usiii/modules/age/Makefile#1 branch .. //depot/projects/usiii/modules/cyclic/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/Makefile.inc#1 branch .. //depot/projects/usiii/modules/dtrace/dtmalloc/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/dtrace/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/dtrace_test/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/dtraceall/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/dtraceall/dtraceall.c#1 branch .. //depot/projects/usiii/modules/dtrace/fasttrap/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/fbt/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/lockstat/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/profile/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/prototype/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/sdt/Makefile#1 branch .. //depot/projects/usiii/modules/dtrace/systrace/Makefile#1 branch .. //depot/projects/usiii/modules/iwn/Makefile#2 integrate .. //depot/projects/usiii/modules/ixgbe/Makefile#3 integrate .. //depot/projects/usiii/modules/mii/Makefile#3 integrate .. //depot/projects/usiii/modules/opensolaris/Makefile#1 branch .. //depot/projects/usiii/net/bpf.c#7 integrate .. //depot/projects/usiii/net/ethernet.h#3 integrate .. //depot/projects/usiii/net/if.c#6 integrate .. //depot/projects/usiii/net/if_atmsubr.c#3 integrate .. //depot/projects/usiii/net/if_ethersubr.c#7 integrate .. //depot/projects/usiii/net/if_fwsubr.c#3 integrate .. //depot/projects/usiii/net/if_gif.c#4 integrate .. //depot/projects/usiii/net/if_gif.h#2 integrate .. //depot/projects/usiii/net/if_gre.c#3 integrate .. //depot/projects/usiii/net/if_gre.h#2 integrate .. //depot/projects/usiii/net/if_iso88025subr.c#4 integrate .. //depot/projects/usiii/net/if_loop.c#4 integrate .. //depot/projects/usiii/net/if_stf.c#4 integrate .. //depot/projects/usiii/net/if_var.h#4 integrate .. //depot/projects/usiii/net/radix_mpath.c#3 integrate .. //depot/projects/usiii/net/radix_mpath.h#2 integrate .. //depot/projects/usiii/net/route.c#6 integrate .. //depot/projects/usiii/net/route.h#4 integrate .. //depot/projects/usiii/net/rtsock.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211.c#7 integrate .. //depot/projects/usiii/net80211/ieee80211.h#5 integrate .. //depot/projects/usiii/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/usiii/net80211/ieee80211_node.c#7 integrate .. //depot/projects/usiii/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/usiii/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/usiii/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211_var.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/usiii/netatalk/at_extern.h#2 integrate .. //depot/projects/usiii/netatalk/at_proto.c#2 integrate .. //depot/projects/usiii/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/usiii/netinet/if_atm.c#2 integrate .. //depot/projects/usiii/netinet/if_ether.c#4 integrate .. //depot/projects/usiii/netinet/in_gif.c#4 integrate .. //depot/projects/usiii/netinet/in_mcast.c#3 integrate .. //depot/projects/usiii/netinet/in_pcb.c#7 integrate .. //depot/projects/usiii/netinet/in_pcb.h#5 integrate .. //depot/projects/usiii/netinet/in_rmx.c#4 integrate .. //depot/projects/usiii/netinet/in_var.h#2 integrate .. //depot/projects/usiii/netinet/ip_dummynet.c#5 integrate .. //depot/projects/usiii/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/usiii/netinet/ip_fw.h#5 integrate .. //depot/projects/usiii/netinet/ip_fw2.c#9 integrate .. //depot/projects/usiii/netinet/ip_icmp.c#4 integrate .. //depot/projects/usiii/netinet/ip_input.c#4 integrate .. //depot/projects/usiii/netinet/ip_mroute.c#3 integrate .. //depot/projects/usiii/netinet/ip_mroute.h#2 integrate .. //depot/projects/usiii/netinet/ip_options.c#5 integrate .. //depot/projects/usiii/netinet/ip_output.c#6 integrate .. //depot/projects/usiii/netinet/ip_var.h#2 integrate .. //depot/projects/usiii/netinet/raw_ip.c#4 integrate .. //depot/projects/usiii/netinet/sctp.h#4 integrate .. //depot/projects/usiii/netinet/sctp_asconf.c#5 integrate .. //depot/projects/usiii/netinet/sctp_asconf.h#3 integrate .. //depot/projects/usiii/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/usiii/netinet/sctp_constants.h#5 integrate .. //depot/projects/usiii/netinet/sctp_indata.c#6 integrate .. //depot/projects/usiii/netinet/sctp_input.c#6 integrate .. //depot/projects/usiii/netinet/sctp_input.h#2 integrate .. //depot/projects/usiii/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/usiii/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/usiii/netinet/sctp_output.c#6 integrate .. //depot/projects/usiii/netinet/sctp_output.h#4 integrate .. //depot/projects/usiii/netinet/sctp_pcb.c#7 integrate .. //depot/projects/usiii/netinet/sctp_pcb.h#5 integrate .. //depot/projects/usiii/netinet/sctp_structs.h#4 integrate .. //depot/projects/usiii/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/usiii/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/usiii/netinet/sctp_timer.c#4 integrate .. //depot/projects/usiii/netinet/sctp_uio.h#3 integrate .. //depot/projects/usiii/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/usiii/netinet/sctp_var.h#5 integrate .. //depot/projects/usiii/netinet/sctputil.c#6 integrate .. //depot/projects/usiii/netinet/sctputil.h#5 integrate .. //depot/projects/usiii/netinet/tcp_input.c#7 integrate .. //depot/projects/usiii/netinet/tcp_subr.c#7 integrate .. //depot/projects/usiii/netinet/tcp_syncache.c#5 integrate .. //depot/projects/usiii/netinet/udp_usrreq.c#5 integrate .. //depot/projects/usiii/netinet6/in6.c#4 integrate .. //depot/projects/usiii/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/usiii/netinet6/in6_rmx.c#3 integrate .. //depot/projects/usiii/netinet6/ip6_input.c#3 integrate .. //depot/projects/usiii/netinet6/ip6_var.h#3 integrate .. //depot/projects/usiii/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/usiii/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/usiii/netipsec/ipsec.c#5 integrate .. //depot/projects/usiii/netipsec/ipsec.h#4 integrate .. //depot/projects/usiii/netipsec/ipsec_input.c#4 integrate .. //depot/projects/usiii/netipsec/ipsec_osdep.h#2 delete .. //depot/projects/usiii/netipsec/ipsec_output.c#4 integrate .. //depot/projects/usiii/netipsec/xform_ah.c#2 integrate .. //depot/projects/usiii/netipsec/xform_esp.c#2 integrate .. //depot/projects/usiii/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/usiii/netipsec/xform_ipip.c#3 integrate .. //depot/projects/usiii/netipx/ipx_proto.c#2 integrate .. //depot/projects/usiii/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/usiii/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/usiii/pc98/cbus/clock.c#4 integrate .. //depot/projects/usiii/pc98/conf/GENERIC#9 integrate .. //depot/projects/usiii/pci/intpm.c#3 integrate .. //depot/projects/usiii/powerpc/aim/machdep.c#8 integrate .. //depot/projects/usiii/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/usiii/powerpc/booke/machdep.c#5 integrate .. //depot/projects/usiii/powerpc/booke/pmap.c#3 integrate .. //depot/projects/usiii/powerpc/conf/GENERIC#7 integrate .. //depot/projects/usiii/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/usiii/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/usiii/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#8 integrate .. //depot/projects/usiii/sparc64/conf/GENERIC#9 integrate .. //depot/projects/usiii/sparc64/include/bus.h#3 integrate .. //depot/projects/usiii/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/usiii/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/usiii/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/usiii/sun4v/conf/GENERIC#5 integrate .. //depot/projects/usiii/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/usiii/sys/_lock.h#3 integrate .. //depot/projects/usiii/sys/_lockmgr.h#2 integrate .. //depot/projects/usiii/sys/_mutex.h#2 integrate .. //depot/projects/usiii/sys/_rwlock.h#2 integrate .. //depot/projects/usiii/sys/_sx.h#2 integrate .. //depot/projects/usiii/sys/clist.h#2 integrate .. //depot/projects/usiii/sys/conf.h#5 integrate .. //depot/projects/usiii/sys/cons.h#2 integrate .. //depot/projects/usiii/sys/domain.h#2 integrate .. //depot/projects/usiii/sys/dtrace_bsd.h#1 branch .. //depot/projects/usiii/sys/file.h#3 integrate .. //depot/projects/usiii/sys/kdb.h#4 integrate .. //depot/projects/usiii/sys/kernel.h#5 integrate .. //depot/projects/usiii/sys/linker.h#3 integrate .. //depot/projects/usiii/sys/lock.h#5 integrate .. //depot/projects/usiii/sys/lockmgr.h#7 integrate .. //depot/projects/usiii/sys/malloc.h#3 integrate .. //depot/projects/usiii/sys/mbuf.h#6 integrate .. //depot/projects/usiii/sys/mutex.h#3 integrate .. //depot/projects/usiii/sys/param.h#10 integrate .. //depot/projects/usiii/sys/pipe.h#2 integrate .. //depot/projects/usiii/sys/proc.h#10 integrate .. //depot/projects/usiii/sys/queue.h#2 integrate .. //depot/projects/usiii/sys/rwlock.h#4 integrate .. //depot/projects/usiii/sys/sdt.h#1 branch .. //depot/projects/usiii/sys/smp.h#4 integrate .. //depot/projects/usiii/sys/socket.h#6 integrate .. //depot/projects/usiii/sys/socketvar.h#4 integrate .. //depot/projects/usiii/sys/syscall.h#7 integrate .. //depot/projects/usiii/sys/syscall.mk#7 integrate .. //depot/projects/usiii/sys/sysproto.h#7 integrate .. //depot/projects/usiii/sys/systm.h#6 integrate .. //depot/projects/usiii/sys/time.h#6 integrate .. //depot/projects/usiii/sys/tty.h#3 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/usiii/ufs/ffs/fs.h#2 integrate .. //depot/projects/usiii/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/usiii/vm/device_pager.c#2 integrate .. //depot/projects/usiii/vm/memguard.c#2 integrate .. //depot/projects/usiii/vm/pmap.h#4 integrate .. //depot/projects/usiii/vm/vm_extern.h#3 integrate .. //depot/projects/usiii/vm/vm_init.c#3 integrate .. //depot/projects/usiii/vm/vm_kern.c#6 integrate .. //depot/projects/usiii/vm/vm_map.c#8 integrate .. //depot/projects/usiii/vm/vm_map.h#5 integrate .. //depot/projects/usiii/vm/vm_mmap.c#6 integrate .. //depot/projects/usiii/vm/vm_object.c#8 integrate .. //depot/projects/usiii/vm/vm_object.h#4 integrate .. //depot/projects/usiii/vm/vm_page.c#7 integrate .. //depot/projects/usiii/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/usiii/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.46 2008/01/23 08:50:34 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.47 2008/05/21 07:56:10 obrien Exp $ .include <bsd.own.mk> @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom gnu \ - i4b isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ + gnu i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ pci rpc security sys ufs vm ${ARCHDIR} @@ -25,15 +25,20 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` # You need the devel/cscope port for this. -cscope: ${.CURDIR}/cscopenamefile - cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile +cscope: cscope.out +cscope.out: ${.CURDIR}/cscope.files + cd ${.CURDIR}; cscope -k -buq -p4 + +${.CURDIR}/cscope.files: .PHONY + cd ${.CURDIR}; \ + find ${CSCOPEDIRS} -name "*.[chSs]" -a -type f > ${.TARGET} -${.CURDIR}/cscopenamefile: - cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} +cscope-clean: + rm -f cscope.files cscope.out cscope.in.out cscope.po.out # You need the devel/global and one of editor/emacs* ports for that. -TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile +TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files rm -f ${.CURDIR}/TAGS - cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile + cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files .include <bsd.subdir.mk> ==== //depot/projects/usiii/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.131 2007/12/07 08:20:15 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $ */ #include "opt_atpic.h" #include "opt_compat.h" #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include <machine/asmacros.h> #include <machine/psl.h> @@ -44,6 +45,21 @@ #include "assym.s" +#ifdef KDTRACE_HOOKS + .bss + .globl dtrace_invop_jump_addr + .align 8 + .type dtrace_invop_jump_addr, @object + .size dtrace_invop_jump_addr, 8 +dtrace_invop_jump_addr: + .zero 8 + .globl dtrace_invop_calltrap_addr + .align 8 + .type dtrace_invop_calltrap_addr, @object + .size dtrace_invop_calltrap_addr, 8 +dtrace_invop_calltrap_addr: + .zero 8 +#endif .text #ifdef HWPMC_HOOKS ENTRY(start_exceptions) @@ -170,6 +186,30 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) +#ifdef KDTRACE_HOOKS + /* + * DTrace Function Boundary Trace (fbt) probes are triggered + * by int3 (0xcc) which causes the #BP (T_BPTFLT) breakpoint + * interrupt. For all other trap types, just handle them in + * the usual way. + */ + cmpq $T_BPTFLT,TF_TRAPNO(%rsp) + jne calltrap + + /* Check if there is no DTrace hook registered. */ + cmpq $0,dtrace_invop_jump_addr + je calltrap + + /* + * Set our jump address for the jump back in the event that + * the breakpoint wasn't caused by DTrace at all. + */ + movq $calltrap, dtrace_invop_calltrap_addr(%rip) + + /* Jump to the code hooked in by DTrace. */ + movq dtrace_invop_jump_addr, %rax + jmpq *dtrace_invop_jump_addr +#endif .globl calltrap .type calltrap,@function calltrap: ==== //depot/projects/usiii/amd64/amd64/genassym.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -214,7 +214,4 @@ ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_UPL)); ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); -ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); -ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); - ASSYM(MSR_GSBASE, MSR_GSBASE); ==== //depot/projects/usiii/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.158 2008/03/02 07:58:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $"); #include "opt_cpu.h" @@ -71,8 +71,6 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); -void setPQL2(int *const size, int *const ways); -static void setPQL2_AMD(int *const size, int *const ways); int cpu_class; char machine[] = "amd64"; @@ -550,30 +548,3 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } - -static void -setPQL2_AMD(int *const size, int *const ways) -{ - if (cpu_exthigh >= 0x80000006) { - u_int regs[4]; - - do_cpuid(0x80000006, regs); - *size = regs[2] >> 16; - *ways = (regs[2] >> 12) & 0x0f; - switch (*ways) { - case 0: /* disabled/not present */ - case 15: /* fully associative */ - default: *ways = 1; break; /* reserved configuration */ - case 4: *ways = 4; break; - case 6: *ways = 8; break; - case 8: *ways = 16; break; - } - } -} - -void -setPQL2(int *const size, int *const ways) -{ - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) - setPQL2_AMD(size, ways); -} ==== //depot/projects/usiii/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,9 +32,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.44 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_ddb.h" @@ -65,6 +66,11 @@ #include <ddb/ddb.h> #endif +#ifdef KDTRACE_HOOKS +#include <sys/dtrace_bsd.h> +cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU]; +#endif + /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -668,6 +674,17 @@ (*la->la_timer_count)++; critical_enter(); +#ifdef KDTRACE_HOOKS + /* + * If the DTrace hooks are configured and a callback function + * has been registered, then call it to process the high speed + * timers. + */ + int cpu = PCPU_GET(cpuid); + if (lapic_cyclic_clock_func[cpu] != NULL) + (*lapic_cyclic_clock_func[cpu])(frame); +#endif + /* Fire hardclock at hz. */ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { ==== //depot/projects/usiii/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.618 2008/05/18 04:16:55 alc Exp $"); /* * Manages physical address maps. @@ -4458,14 +4458,26 @@ critical_exit(); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) +/* + * Increase the starting virtual address of the given mapping if a + * different alignment might result in more superpage mappings. + */ +void +pmap_align_superpage(vm_object_t object, vm_ooffset_t offset, + vm_offset_t *addr, vm_size_t size) { + vm_offset_t superpage_offset; - if ((obj == NULL) || (size < NBPDR) || (obj->type != OBJT_DEVICE)) { - return addr; - } - - addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); - return addr; + if (size < NBPDR) + return; + if (object != NULL && (object->flags & OBJ_COLORED) != 0) + offset += ptoa(object->pg_color); + superpage_offset = offset & PDRMASK; + if (size - ((NBPDR - superpage_offset) & PDRMASK) < NBPDR || + (*addr & PDRMASK) == superpage_offset) + return; + if ((*addr & PDRMASK) < superpage_offset) + *addr = (*addr & ~PDRMASK) + superpage_offset; + else + *addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset; } ==== //depot/projects/usiii/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.325 2008/03/12 10:11:54 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.326 2008/05/24 06:32:26 jb Exp $"); /* * AMD64 Trap and System call handling @@ -49,6 +49,7 @@ #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> @@ -94,6 +95,26 @@ #endif #include <machine/tss.h> +#ifdef KDTRACE_HOOKS +#include <sys/dtrace_bsd.h> + +/* + * This is a hook which is initialised by the dtrace module + * to handle traps which might occur during DTrace probe + * execution. + */ +dtrace_trap_func_t dtrace_trap_func; + +dtrace_doubletrap_func_t dtrace_doubletrap_func; + +/* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; +#endif + extern void trap(struct trapframe *frame); extern void syscall(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); @@ -199,6 +220,24 @@ goto out; #endif +#ifdef KDTRACE_HOOKS + /* + * A trap can occur while DTrace executes a probe. Before + * executing the probe, DTrace blocks re-scheduling and sets + * a flag in it's per-cpu flags to indicate that it doesn't + * want to fault. On returning from the the probe, the no-fault + * flag is cleared and finally re-scheduling is enabled. + * + * If the DTrace kernel module has registered a trap handler, + * call it and if it returns non-zero, assume that it has + * handled the trap and modified the trap frame so that this + * function can return normally. + */ + if (dtrace_trap_func != NULL) + if ((*dtrace_trap_func)(frame, type)) + goto out; +#endif + if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -730,6 +769,10 @@ void dblfault_handler(struct trapframe *frame) { +#ifdef KDTRACE_HOOKS + if (dtrace_doubletrap_func != NULL) + (*dtrace_doubletrap_func)(); +#endif printf("\nFatal double fault\n"); printf("rip = 0x%lx\n", frame->tf_rip); printf("rsp = 0x%lx\n", frame->tf_rsp); @@ -839,9 +882,34 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef KDTRACE_HOOKS + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'entry', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_entry != 0) + (*systrace_probe_func)(callp->sy_entry, code, callp, + args); +#endif + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); AUDIT_SYSCALL_EXIT(error, td); + + /* Save the latest error return value. */ + td->td_errno = error; + +#ifdef KDTRACE_HOOKS + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'return', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_return != 0) + (*systrace_probe_func)(callp->sy_return, code, callp, + args); +#endif } switch (error) { ==== //depot/projects/usiii/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.500 2008/05/19 02:30:27 yongari Exp $ cpu HAMMER ident GENERIC @@ -192,12 +192,14 @@ device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device age # Attansic/Atheros L1 Gigabit Ethernet device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet @@ -215,7 +217,6 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet ==== //depot/projects/usiii/amd64/linux32/linux32_dummy.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.12 2008/04/23 15:56:33 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.13 2008/05/13 20:01:26 rdivacky Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,8 +98,6 @@ DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); -DUMMY(set_robust_list); -DUMMY(get_robust_list); DUMMY(splice); DUMMY(sync_file_range); DUMMY(tee); ==== //depot/projects/usiii/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.36 2008/04/16 19:27:35 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.33 2008/04/16 19:25:38 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -969,10 +969,13 @@ register_t dummy; }; struct linux_set_robust_list_args { - register_t dummy; + char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; }; struct linux_get_robust_list_args { - register_t dummy; + char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)]; + char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)]; + char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)]; }; struct linux_splice_args { register_t dummy; ==== //depot/projects/usiii/amd64/linux32/linux32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.36 2008/04/16 19:27:35 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.33 2008/04/16 19:25:38 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/usiii/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.36 2008/04/16 19:27:35 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.33 2008/04/16 19:25:38 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp */ #include "opt_compat.h" @@ -330,8 +330,8 @@ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ - { 0, (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ - { 0, (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ + { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ + { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 }, /* 313 = linux_splice */ { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 }, /* 314 = linux_sync_file_range */ { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 }, /* 315 = linux_tee */ ==== //depot/projects/usiii/amd64/linux32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.33 2008/04/16 19:25:38 jkim Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -493,8 +493,10 @@ 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } 310 AUE_NULL STD { int linux_unshare(void); } -311 AUE_NULL STD { int linux_set_robust_list(void); } -312 AUE_NULL STD { int linux_get_robust_list(void); } +311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \ + l_size_t len); } +312 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \ + l_size_t *len); } 313 AUE_NULL STD { int linux_splice(void); } 314 AUE_NULL STD { int linux_sync_file_range(void); } 315 AUE_NULL STD { int linux_tee(void); } ==== //depot/projects/usiii/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.12 2007/10/18 05:33:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.13 2008/05/23 04:03:53 alc Exp $"); #include <sys/systm.h> #include <sys/param.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805250016.m4P0GVLu010417>