From owner-p4-projects@FreeBSD.ORG Sun May 25 00:07:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1542B106566B; Sun, 25 May 2008 00:07:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA8C11065674 for ; Sun, 25 May 2008 00:07:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D00438FC1F for ; Sun, 25 May 2008 00:07:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4P07HW0010140 for ; Sun, 25 May 2008 00:07:17 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4P07HC8010138 for perforce@freebsd.org; Sun, 25 May 2008 00:07:17 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 25 May 2008 00:07:17 GMT Message-Id: <200805250007.m4P07HC8010138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 142230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2008 00:07:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=142230 Change 142230 by rpaulo@rpaulo_zoo on 2008/05/25 00:07:13 IFC Affected files ... .. //depot/projects/tcpecn/Makefile#3 integrate .. //depot/projects/tcpecn/amd64/amd64/exception.S#3 integrate .. //depot/projects/tcpecn/amd64/amd64/genassym.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/tcpecn/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/pmap.c#9 integrate .. //depot/projects/tcpecn/amd64/amd64/trap.c#4 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#9 integrate .. //depot/projects/tcpecn/arm/arm/identcpu.c#2 integrate .. //depot/projects/tcpecn/arm/arm/pmap.c#8 integrate .. //depot/projects/tcpecn/boot/forth/loader.conf#4 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch .. //depot/projects/tcpecn/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch .. //depot/projects/tcpecn/cddl/dev/cyclic/cyclic.c#1 branch .. //depot/projects/tcpecn/cddl/dev/cyclic/cyclic_test.c#1 branch .. //depot/projects/tcpecn/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtmalloc/dtmalloc.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/dis_tables.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/dis_tables.h#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/amd64/instr_size.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_anon.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_cddl.h#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_clone.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_debug.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_hacks.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_ioctl.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_load.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_modevent.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_sysctl.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_test.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_unload.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/dtrace_vtime.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/dis_tables.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/dis_tables.h#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch .. //depot/projects/tcpecn/cddl/dev/dtrace/i386/instr_size.c#1 branch .. //depot/projects/tcpecn/cddl/dev/fbt/fbt.c#1 branch .. //depot/projects/tcpecn/cddl/dev/profile/profile.c#1 branch .. //depot/projects/tcpecn/cddl/dev/prototype.c#1 branch .. //depot/projects/tcpecn/cddl/dev/sdt/sdt.c#1 branch .. //depot/projects/tcpecn/cddl/dev/systrace/systrace.c#1 branch .. //depot/projects/tcpecn/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/tcpecn/conf/Makefile.amd64#3 integrate .. //depot/projects/tcpecn/conf/NOTES#10 integrate .. //depot/projects/tcpecn/conf/files#11 integrate .. //depot/projects/tcpecn/conf/kern.post.mk#3 integrate .. //depot/projects/tcpecn/conf/kern.pre.mk#3 integrate .. //depot/projects/tcpecn/conf/options#10 integrate .. //depot/projects/tcpecn/conf/options.amd64#4 integrate .. //depot/projects/tcpecn/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/tcpecn/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/tcpecn/dev/age/if_age.c#1 branch .. //depot/projects/tcpecn/dev/age/if_agereg.h#1 branch .. //depot/projects/tcpecn/dev/age/if_agevar.h#1 branch .. //depot/projects/tcpecn/dev/bge/if_bge.c#8 integrate .. //depot/projects/tcpecn/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/tcpecn/dev/ciss/ciss.c#3 integrate .. //depot/projects/tcpecn/dev/em/if_em.c#6 integrate .. //depot/projects/tcpecn/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/README#1 branch .. //depot/projects/tcpecn/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/tcpecn/dev/ixgbe/tcp_lro.c#1 branch .. //depot/projects/tcpecn/dev/ixgbe/tcp_lro.h#1 branch .. //depot/projects/tcpecn/dev/mii/atphy.c#1 branch .. //depot/projects/tcpecn/dev/mii/atphyreg.h#1 branch .. //depot/projects/tcpecn/dev/mii/miidevs#7 integrate .. //depot/projects/tcpecn/dev/puc/pucdata.c#3 integrate .. //depot/projects/tcpecn/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/tcpecn/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/tcpecn/dev/speaker/spkr.c#3 integrate .. //depot/projects/tcpecn/dev/sym/sym_defs.h#2 integrate .. //depot/projects/tcpecn/dev/sym/sym_fw.h#2 integrate .. //depot/projects/tcpecn/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/tcpecn/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/tcpecn/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/tcpecn/dev/usb/umass.c#4 integrate .. //depot/projects/tcpecn/dev/usb/usb.c#2 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#10 integrate .. //depot/projects/tcpecn/dev/usb/uscanner.c#4 integrate .. //depot/projects/tcpecn/dev/usb/uxb360gp_rdesc.h#2 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/tcpecn/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/tcpecn/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/tcpecn/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/tcpecn/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/tcpecn/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/tcpecn/geom/geom_subr.c#3 integrate .. //depot/projects/tcpecn/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#9 integrate .. //depot/projects/tcpecn/i386/i386/exception.s#3 integrate .. //depot/projects/tcpecn/i386/i386/genassym.c#2 integrate .. //depot/projects/tcpecn/i386/i386/identcpu.c#3 integrate .. //depot/projects/tcpecn/i386/i386/local_apic.c#3 integrate .. //depot/projects/tcpecn/i386/i386/pmap.c#9 integrate .. //depot/projects/tcpecn/i386/i386/trap.c#4 integrate .. //depot/projects/tcpecn/i386/isa/clock.c#5 integrate .. //depot/projects/tcpecn/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/tcpecn/ia64/ia64/machdep.c#6 integrate .. //depot/projects/tcpecn/ia64/ia64/pmap.c#7 integrate .. //depot/projects/tcpecn/kern/imgact_elf.c#6 integrate .. //depot/projects/tcpecn/kern/kern_conf.c#4 integrate .. //depot/projects/tcpecn/kern/kern_ctf.c#1 branch .. //depot/projects/tcpecn/kern/kern_descrip.c#10 integrate .. //depot/projects/tcpecn/kern/kern_dtrace.c#1 branch .. //depot/projects/tcpecn/kern/kern_exec.c#6 integrate .. //depot/projects/tcpecn/kern/kern_exit.c#5 integrate .. //depot/projects/tcpecn/kern/kern_fork.c#3 integrate .. //depot/projects/tcpecn/kern/kern_linker.c#6 integrate .. //depot/projects/tcpecn/kern/kern_malloc.c#4 integrate .. //depot/projects/tcpecn/kern/kern_proc.c#6 integrate .. //depot/projects/tcpecn/kern/kern_sdt.c#1 branch .. //depot/projects/tcpecn/kern/kern_sig.c#5 integrate .. //depot/projects/tcpecn/kern/kern_sx.c#4 integrate .. //depot/projects/tcpecn/kern/link_elf.c#4 integrate .. //depot/projects/tcpecn/kern/link_elf_obj.c#4 integrate .. //depot/projects/tcpecn/kern/linker_if.m#2 integrate .. //depot/projects/tcpecn/kern/subr_bus.c#6 integrate .. //depot/projects/tcpecn/kern/subr_lock.c#5 integrate .. //depot/projects/tcpecn/kern/subr_smp.c#5 integrate .. //depot/projects/tcpecn/kern/subr_witness.c#6 integrate .. //depot/projects/tcpecn/kern/sys_pipe.c#4 integrate .. //depot/projects/tcpecn/kern/tty.c#5 integrate .. //depot/projects/tcpecn/kern/tty_cons.c#5 integrate .. //depot/projects/tcpecn/kern/tty_subr.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_sem.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/tcpecn/kern/uipc_syscalls.c#8 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#9 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#11 integrate .. //depot/projects/tcpecn/mips/mips/pmap.c#4 integrate .. //depot/projects/tcpecn/modules/Makefile#8 integrate .. //depot/projects/tcpecn/modules/age/Makefile#1 branch .. //depot/projects/tcpecn/modules/cyclic/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/Makefile.inc#1 branch .. //depot/projects/tcpecn/modules/dtrace/dtmalloc/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/dtrace/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/dtrace_test/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/dtraceall/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/dtraceall/dtraceall.c#1 branch .. //depot/projects/tcpecn/modules/dtrace/fasttrap/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/fbt/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/lockstat/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/profile/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/prototype/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/sdt/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/systrace/Makefile#1 branch .. //depot/projects/tcpecn/modules/iwn/Makefile#2 integrate .. //depot/projects/tcpecn/modules/ixgbe/Makefile#3 integrate .. //depot/projects/tcpecn/modules/mii/Makefile#3 integrate .. //depot/projects/tcpecn/modules/opensolaris/Makefile#1 branch .. //depot/projects/tcpecn/net/ethernet.h#2 integrate .. //depot/projects/tcpecn/net/if.c#5 integrate .. //depot/projects/tcpecn/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_node.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_dummynet.c#4 integrate .. //depot/projects/tcpecn/netinet/raw_ip.c#4 integrate .. //depot/projects/tcpecn/netinet/sctp.h#3 integrate .. //depot/projects/tcpecn/netinet/sctp_asconf.c#3 integrate .. //depot/projects/tcpecn/netinet/sctp_asconf.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_constants.h#3 integrate .. //depot/projects/tcpecn/netinet/sctp_indata.c#4 integrate .. //depot/projects/tcpecn/netinet/sctp_input.c#4 integrate .. //depot/projects/tcpecn/netinet/sctp_input.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/tcpecn/netinet/sctp_output.c#5 integrate .. //depot/projects/tcpecn/netinet/sctp_output.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_pcb.c#5 integrate .. //depot/projects/tcpecn/netinet/sctp_pcb.h#3 integrate .. //depot/projects/tcpecn/netinet/sctp_structs.h#3 integrate .. //depot/projects/tcpecn/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/tcpecn/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_timer.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_uio.h#2 integrate .. //depot/projects/tcpecn/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/tcpecn/netinet/sctp_var.h#3 integrate .. //depot/projects/tcpecn/netinet/sctputil.c#5 integrate .. //depot/projects/tcpecn/netinet/sctputil.h#3 integrate .. //depot/projects/tcpecn/netinet/udp_usrreq.c#3 integrate .. //depot/projects/tcpecn/netinet6/ip6_input.c#4 integrate .. //depot/projects/tcpecn/netinet6/ip6_var.h#4 integrate .. //depot/projects/tcpecn/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/tcpecn/netipsec/ipsec.c#5 integrate .. //depot/projects/tcpecn/netipsec/ipsec.h#4 integrate .. //depot/projects/tcpecn/netipsec/ipsec_input.c#3 integrate .. //depot/projects/tcpecn/netipsec/ipsec_osdep.h#2 delete .. //depot/projects/tcpecn/netipsec/ipsec_output.c#4 integrate .. //depot/projects/tcpecn/netipsec/xform_ah.c#2 integrate .. //depot/projects/tcpecn/netipsec/xform_esp.c#2 integrate .. //depot/projects/tcpecn/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/tcpecn/netipsec/xform_ipip.c#3 integrate .. //depot/projects/tcpecn/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/tcpecn/pc98/cbus/clock.c#4 integrate .. //depot/projects/tcpecn/pc98/conf/GENERIC#7 integrate .. //depot/projects/tcpecn/powerpc/aim/machdep.c#7 integrate .. //depot/projects/tcpecn/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/tcpecn/powerpc/booke/machdep.c#3 integrate .. //depot/projects/tcpecn/powerpc/booke/pmap.c#3 integrate .. //depot/projects/tcpecn/powerpc/conf/GENERIC#6 integrate .. //depot/projects/tcpecn/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/tcpecn/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/tcpecn/security/audit/audit_worker.c#6 integrate .. //depot/projects/tcpecn/sparc64/conf/GENERIC#9 integrate .. //depot/projects/tcpecn/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/tcpecn/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/tcpecn/sun4v/conf/GENERIC#5 integrate .. //depot/projects/tcpecn/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/tcpecn/sys/_lock.h#3 integrate .. //depot/projects/tcpecn/sys/_lockmgr.h#2 integrate .. //depot/projects/tcpecn/sys/_mutex.h#2 integrate .. //depot/projects/tcpecn/sys/_rwlock.h#2 integrate .. //depot/projects/tcpecn/sys/_sx.h#2 integrate .. //depot/projects/tcpecn/sys/clist.h#2 integrate .. //depot/projects/tcpecn/sys/conf.h#4 integrate .. //depot/projects/tcpecn/sys/cons.h#2 integrate .. //depot/projects/tcpecn/sys/dtrace_bsd.h#1 branch .. //depot/projects/tcpecn/sys/file.h#3 integrate .. //depot/projects/tcpecn/sys/kdb.h#4 integrate .. //depot/projects/tcpecn/sys/kernel.h#6 integrate .. //depot/projects/tcpecn/sys/linker.h#3 integrate .. //depot/projects/tcpecn/sys/lock.h#4 integrate .. //depot/projects/tcpecn/sys/lockmgr.h#8 integrate .. //depot/projects/tcpecn/sys/malloc.h#2 integrate .. //depot/projects/tcpecn/sys/mutex.h#2 integrate .. //depot/projects/tcpecn/sys/pipe.h#2 integrate .. //depot/projects/tcpecn/sys/proc.h#9 integrate .. //depot/projects/tcpecn/sys/queue.h#2 integrate .. //depot/projects/tcpecn/sys/rwlock.h#5 integrate .. //depot/projects/tcpecn/sys/sdt.h#1 branch .. //depot/projects/tcpecn/sys/smp.h#3 integrate .. //depot/projects/tcpecn/sys/socketvar.h#5 integrate .. //depot/projects/tcpecn/sys/systm.h#4 integrate .. //depot/projects/tcpecn/sys/time.h#6 integrate .. //depot/projects/tcpecn/sys/tty.h#3 integrate .. //depot/projects/tcpecn/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/tcpecn/ufs/ffs/fs.h#2 integrate .. //depot/projects/tcpecn/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/tcpecn/vm/device_pager.c#2 integrate .. //depot/projects/tcpecn/vm/pmap.h#4 integrate .. //depot/projects/tcpecn/vm/vm_mmap.c#5 integrate .. //depot/projects/tcpecn/vm/vm_object.c#6 integrate .. //depot/projects/tcpecn/vm/vm_object.h#3 integrate .. //depot/projects/tcpecn/vm/vm_page.c#6 integrate .. //depot/projects/tcpecn/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/tcpecn/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 @@ -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 ==== //depot/projects/tcpecn/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 #include @@ -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/tcpecn/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__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/tcpecn/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__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/tcpecn/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,9 +32,10 @@ */ #include -__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 #endif +#ifdef KDTRACE_HOOKS +#include +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/tcpecn/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.617 2008/05/11 20:33:46 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,18 +4458,6 @@ critical_exit(); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - if ((obj == NULL) || (size < NBPDR) || (obj->type != OBJT_DEVICE)) { - return addr; - } - - addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); - return addr; -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/tcpecn/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__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 @@ -94,6 +95,26 @@ #endif #include +#ifdef KDTRACE_HOOKS +#include + +/* + * 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/tcpecn/amd64/conf/GENERIC#9 (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/tcpecn/arm/arm/identcpu.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__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 #include #include @@ -356,14 +356,6 @@ "**unknown 15**", }; -void setPQL2(int *const size, int *const ways); - -void -setPQL2(int *const size, int *const ways) -{ - return; -} - extern int ctrl; void ==== //depot/projects/tcpecn/arm/arm/pmap.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.100 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); #include #include #include @@ -4348,13 +4348,6 @@ } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - return(addr); -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/tcpecn/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.124 2008/04/08 01:47:33 weongyo Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.125 2008/05/19 02:13:50 yongari Exp $ ############################################################## ### Basic configuration options ############################ @@ -207,6 +207,7 @@ ############################################################## miibus_load="NO" # miibus support, needed for some drivers +if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i if_arl_load="NO" # Aironet Arlan 655 wireless network adapter ==== //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.4 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.5 2008/05/24 19:30:38 bz Exp $"); #include #include @@ -200,7 +200,6 @@ } #ifdef _KERNEL -extern void zone_drain(uma_zone_t zone); void kmem_cache_reap_now(kmem_cache_t *cache) { ==== //depot/projects/tcpecn/cddl/compat/opensolaris/sys/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.3 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -32,6 +32,10 @@ #include #include +#define casptr(_a, _b, _c) \ + atomic_cmpset_ptr((volatile uintptr_t *)(_a), (uintptr_t)(_b), (uintptr_t) (_c)) +#define cas32 atomic_cmpset_32 + #ifndef __LP64__ extern void atomic_add_64(volatile uint64_t *target, int64_t delta); extern void *atomic_cas_ptr(volatile void *target, void *cmp, void *newval); ==== //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cmn_err.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cmn_err.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cmn_err.h,v 1.3 2008/05/22 08:33:24 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_CMN_ERR_H_ @@ -44,44 +44,8 @@ #define CE_PANIC 3 /* panic */ #define CE_IGNORE 4 /* print nothing */ -static __inline void -vcmn_err(int ce, const char *fmt, va_list adx) -{ - char buf[256]; - - switch (ce) { - case CE_CONT: - snprintf(buf, sizeof(buf), "ZFS(cont): %s\n", fmt); - break; - case CE_NOTE: - snprintf(buf, sizeof(buf), "ZFS: NOTICE: %s\n", fmt); - break; - case CE_WARN: - snprintf(buf, sizeof(buf), "ZFS: WARNING: %s\n", fmt); - break; - case CE_PANIC: - snprintf(buf, sizeof(buf), "ZFS(panic): %s\n", fmt); - break; - case CE_IGNORE: - break; - default: - panic("unknown severity level"); - } - if (ce != CE_IGNORE) - vprintf(buf, adx); - if (ce == CE_PANIC) - panic("ZFS"); -} - -static __inline void -cmn_err(int ce, const char *fmt, ...) -{ - va_list adx; - - va_start(adx, fmt); - vcmn_err(ce, fmt, adx); - va_end(adx); -} +void cmn_err(int, const char *, ...); +void vcmn_err(int, const char *, va_list); #ifdef __cplusplus } ==== //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpuvar.h#3 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.4 2008/05/22 08:33:24 jb Exp $ */ /* @@ -30,8 +30,30 @@ #define _COMPAT_OPENSOLARIS_SYS_CPUVAR_H #include +#include #ifdef _KERNEL + +struct cyc_cpu; + +typedef struct { + int cpuid; + struct cyc_cpu *cpu_cyclic; + uint32_t cpu_flags; + uint_t cpu_intr_actv; + uintptr_t cpu_profile_pc; + uintptr_t cpu_profile_upc; + uintptr_t cpu_dtrace_caller; /* DTrace: caller, if any */ + hrtime_t cpu_dtrace_chillmark; /* DTrace: chill mark time */ + hrtime_t cpu_dtrace_chilled; /* DTrace: total chill time */ +} solaris_cpu_t; + +/* Some code may choose to redefine this if pcpu_t would be more useful. */ +#define cpu_t solaris_cpu_t +#define cpu_id cpuid + +extern solaris_cpu_t solaris_cpu[]; + #define CPU_CACHE_COHERENCE_SIZE 64 /* @@ -53,33 +75,50 @@ } cpu_core_t; extern cpu_core_t cpu_core[]; + +extern kmutex_t cpu_lock; #endif /* _KERNEL */ /* - * DTrace flags. + * Flags in the CPU structure. + * + * These are protected by cpu_lock (except during creation). + * + * Offlined-CPUs have three stages of being offline: + * + * CPU_ENABLE indicates that the CPU is participating in I/O interrupts + * that can be directed at a number of different CPUs. If CPU_ENABLE + * is off, the CPU will not be given interrupts that can be sent elsewhere, + * but will still get interrupts from devices associated with that CPU only, + * and from other CPUs. + * + * CPU_OFFLINE indicates that the dispatcher should not allow any threads + * other than interrupt threads to run on that CPU. A CPU will not have + * CPU_OFFLINE set if there are any bound threads (besides interrupts). + * + * CPU_QUIESCED is set if p_offline was able to completely turn idle the + * CPU and it will not have to run interrupt threads. In this case it'll + * stay in the idle loop until CPU_QUIESCED is turned off. + * + * CPU_FROZEN is used only by CPR to mark CPUs that have been successfully + * suspended (in the suspend path), or have yet to be resumed (in the resume + * case). + * + * On some platforms CPUs can be individually powered off. + * The following flags are set for powered off CPUs: CPU_QUIESCED, + * CPU_OFFLINE, and CPU_POWEROFF. The following flags are cleared: + * CPU_RUNNING, CPU_READY, CPU_EXISTS, and CPU_ENABLE. */ -#define CPU_DTRACE_NOFAULT 0x0001 /* Don't fault */ -#define CPU_DTRACE_DROP 0x0002 /* Drop this ECB */ -#define CPU_DTRACE_BADADDR 0x0004 /* DTrace fault: bad address */ -#define CPU_DTRACE_BADALIGN 0x0008 /* DTrace fault: bad alignment */ -#define CPU_DTRACE_DIVZERO 0x0010 /* DTrace fault: divide by zero */ -#define CPU_DTRACE_ILLOP 0x0020 /* DTrace fault: illegal operation */ -#define CPU_DTRACE_NOSCRATCH 0x0040 /* DTrace fault: out of scratch */ -#define CPU_DTRACE_KPRIV 0x0080 /* DTrace fault: bad kernel access */ -#define CPU_DTRACE_UPRIV 0x0100 /* DTrace fault: bad user access */ -#define CPU_DTRACE_TUPOFLOW 0x0200 /* DTrace fault: tuple stack overflow */ -#if defined(__sparc) -#define CPU_DTRACE_FAKERESTORE 0x0400 /* pid provider hint to getreg */ >>> TRUNCATED FOR MAIL (1000 lines) <<<