From owner-p4-projects@FreeBSD.ORG Wed May 14 10:33:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED9791065675; Wed, 14 May 2008 10:33:58 +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 AEF991065673 for ; Wed, 14 May 2008 10:33:58 +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 9EA168FC21 for ; Wed, 14 May 2008 10:33:58 +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 m4EAXwkV081393 for ; Wed, 14 May 2008 10:33:58 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4EAXvrW081391 for perforce@freebsd.org; Wed, 14 May 2008 10:33:57 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 14 May 2008 10:33:57 GMT Message-Id: <200805141033.m4EAXvrW081391@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 141592 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: Wed, 14 May 2008 10:33:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=141592 Change 141592 by rpaulo@rpaulo_zoo on 2008/05/14 10:33:22 IFC Affected files ... .. //depot/projects/tcpecn/amd64/amd64/pmap.c#8 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#8 integrate .. //depot/projects/tcpecn/amd64/conf/NOTES#7 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/tcpecn/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/tcpecn/arm/arm/pmap.c#7 integrate .. //depot/projects/tcpecn/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/tcpecn/compat/linux/linux_emul.c#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_emul.h#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_futex.c#4 integrate .. //depot/projects/tcpecn/compat/linux/linux_futex.h#3 integrate .. //depot/projects/tcpecn/compat/linux/linux_misc.c#6 integrate .. //depot/projects/tcpecn/conf/NOTES#9 integrate .. //depot/projects/tcpecn/conf/files#10 integrate .. //depot/projects/tcpecn/conf/files.powerpc#7 integrate .. //depot/projects/tcpecn/conf/files.sun4v#4 integrate .. //depot/projects/tcpecn/conf/kern.mk#3 integrate .. //depot/projects/tcpecn/conf/ldscript.mips#2 integrate .. //depot/projects/tcpecn/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/tcpecn/conf/options#9 integrate .. //depot/projects/tcpecn/contrib/dev/iwn/LICENSE#1 branch .. //depot/projects/tcpecn/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch .. //depot/projects/tcpecn/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/tcpecn/contrib/pf/net/pf.c#3 integrate .. //depot/projects/tcpecn/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/tcpecn/contrib/rdma/core_priv.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_addr.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_cache.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_cm.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_fmr_pool.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_mad.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_marshall.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_pack.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_sa.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_smi.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_umem.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_user_cm.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_user_mad.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_user_sa.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_user_verbs.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/ib_verbs.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/iw_cm.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/krping/getopt.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/krping/getopt.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/krping/krping.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/krping/krping.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/krping/krping_dev.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_addr.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_cache.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_cm.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_cm_ib.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_cma.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_device.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_iwcm.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_user_cm.h#1 branch .. //depot/projects/tcpecn/contrib/rdma/rdma_verbs.c#1 branch .. //depot/projects/tcpecn/contrib/rdma/types.h#1 branch .. //depot/projects/tcpecn/dev/ata/ata-disk.c#5 integrate .. //depot/projects/tcpecn/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/tcpecn/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/tcpecn/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/tcpecn/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/tcpecn/dev/ath/if_ath.c#6 integrate .. //depot/projects/tcpecn/dev/ath/if_athvar.h#3 integrate .. //depot/projects/tcpecn/dev/bce/if_bce.c#5 integrate .. //depot/projects/tcpecn/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/tcpecn/dev/bge/if_bge.c#7 integrate .. //depot/projects/tcpecn/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/tcpecn/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/tcpecn/dev/cxgb/t3cdev.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/tcpecn/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/tcpecn/dev/firewire/firewire.c#2 integrate .. //depot/projects/tcpecn/dev/firewire/fwohci.c#2 integrate .. //depot/projects/tcpecn/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/tcpecn/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/tcpecn/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/tcpecn/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/tcpecn/dev/iwn/if_iwn.c#1 branch .. //depot/projects/tcpecn/dev/iwn/if_iwnreg.h#1 branch .. //depot/projects/tcpecn/dev/iwn/if_iwnvar.h#1 branch .. //depot/projects/tcpecn/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/tcpecn/dev/malo/if_malo.c#3 integrate .. //depot/projects/tcpecn/dev/mfi/mfi.c#6 integrate .. //depot/projects/tcpecn/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/tcpecn/dev/mii/brgphy.c#4 integrate .. //depot/projects/tcpecn/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/tcpecn/dev/mii/miidevs#6 integrate .. //depot/projects/tcpecn/dev/mpt/mpt.h#2 integrate .. //depot/projects/tcpecn/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/tcpecn/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/tcpecn/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/tcpecn/dev/mpt/mpt_user.c#1 branch .. //depot/projects/tcpecn/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/tcpecn/dev/ral/rt2560.c#4 integrate .. //depot/projects/tcpecn/dev/ral/rt2661.c#3 integrate .. //depot/projects/tcpecn/dev/sio/sio.c#3 integrate .. //depot/projects/tcpecn/dev/uart/uart_core.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ehci.c#6 integrate .. //depot/projects/tcpecn/dev/usb/if_axe.c#3 integrate .. //depot/projects/tcpecn/dev/usb/if_rum.c#6 integrate .. //depot/projects/tcpecn/dev/usb/if_ural.c#3 integrate .. //depot/projects/tcpecn/dev/usb/if_zyd.c#6 integrate .. //depot/projects/tcpecn/dev/usb/ohci.c#3 integrate .. //depot/projects/tcpecn/dev/usb/uipaq.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ums.c#4 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#9 integrate .. //depot/projects/tcpecn/dev/wi/if_wi.c#3 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/tcpecn/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#8 integrate .. //depot/projects/tcpecn/i386/conf/NOTES#6 integrate .. //depot/projects/tcpecn/i386/cpufreq/est.c#4 integrate .. //depot/projects/tcpecn/i386/i386/pmap.c#8 integrate .. //depot/projects/tcpecn/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/tcpecn/i386/linux/linux_proto.h#4 integrate .. //depot/projects/tcpecn/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/tcpecn/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/tcpecn/i386/linux/syscalls.master#4 integrate .. //depot/projects/tcpecn/ia64/ia64/pmap.c#6 integrate .. //depot/projects/tcpecn/kern/init_sysent.c#7 integrate .. //depot/projects/tcpecn/kern/kern_cpu.c#3 integrate .. //depot/projects/tcpecn/kern/kern_event.c#5 integrate .. //depot/projects/tcpecn/kern/kern_kthread.c#3 integrate .. //depot/projects/tcpecn/kern/kern_lockf.c#4 integrate .. //depot/projects/tcpecn/kern/kern_malloc.c#3 integrate .. //depot/projects/tcpecn/kern/kern_switch.c#4 integrate .. //depot/projects/tcpecn/kern/subr_blist.c#2 integrate .. //depot/projects/tcpecn/kern/subr_kdb.c#3 integrate .. //depot/projects/tcpecn/kern/subr_param.c#2 integrate .. //depot/projects/tcpecn/kern/subr_witness.c#5 integrate .. //depot/projects/tcpecn/kern/sys_socket.c#3 integrate .. //depot/projects/tcpecn/kern/syscalls.c#7 integrate .. //depot/projects/tcpecn/kern/syscalls.master#7 integrate .. //depot/projects/tcpecn/kern/systrace_args.c#7 integrate .. //depot/projects/tcpecn/kern/uipc_mbuf.c#5 integrate .. //depot/projects/tcpecn/kern/uipc_socket.c#5 integrate .. //depot/projects/tcpecn/kern/vfs_export.c#2 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#8 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#10 integrate .. //depot/projects/tcpecn/mips/include/am29lv081b.h#2 delete .. //depot/projects/tcpecn/mips/include/cp0.h#2 delete .. //depot/projects/tcpecn/mips/include/float.h#2 integrate .. //depot/projects/tcpecn/mips/include/pmap.h#3 integrate .. //depot/projects/tcpecn/mips/mips/mips_subr.c#2 delete .. //depot/projects/tcpecn/mips/mips/pmap.c#3 integrate .. //depot/projects/tcpecn/modules/Makefile#7 integrate .. //depot/projects/tcpecn/modules/cxgb/Makefile#4 integrate .. //depot/projects/tcpecn/modules/cxgb/iw_cxgb/Makefile#1 branch .. //depot/projects/tcpecn/modules/esp/Makefile#2 integrate .. //depot/projects/tcpecn/modules/hfa/Makefile#2 integrate .. //depot/projects/tcpecn/modules/hme/Makefile#2 integrate .. //depot/projects/tcpecn/modules/isp/Makefile#2 integrate .. //depot/projects/tcpecn/modules/ispfw/Makefile#2 integrate .. //depot/projects/tcpecn/modules/iwn/Makefile#1 branch .. //depot/projects/tcpecn/modules/iwnfw/Makefile#1 branch .. //depot/projects/tcpecn/modules/le/Makefile#2 integrate .. //depot/projects/tcpecn/modules/mpt/Makefile#2 integrate .. //depot/projects/tcpecn/modules/rdma/Makefile#1 branch .. //depot/projects/tcpecn/modules/rdma/addr/Makefile#1 branch .. //depot/projects/tcpecn/modules/rdma/cma/Makefile#1 branch .. //depot/projects/tcpecn/modules/rdma/core/Makefile#1 branch .. //depot/projects/tcpecn/modules/rdma/iwcm/Makefile#1 branch .. //depot/projects/tcpecn/modules/rdma/krping/Makefile#1 branch .. //depot/projects/tcpecn/modules/scc/Makefile#3 integrate .. //depot/projects/tcpecn/modules/sound/driver/Makefile#2 integrate .. //depot/projects/tcpecn/modules/wlan/Makefile#3 integrate .. //depot/projects/tcpecn/net/bpf.c#7 integrate .. //depot/projects/tcpecn/net/if.c#4 integrate .. //depot/projects/tcpecn/net/if_atmsubr.c#2 integrate .. //depot/projects/tcpecn/net/if_ethersubr.c#3 integrate .. //depot/projects/tcpecn/net/if_fwsubr.c#2 integrate .. //depot/projects/tcpecn/net/if_gif.c#3 integrate .. //depot/projects/tcpecn/net/if_gif.h#2 integrate .. //depot/projects/tcpecn/net/if_gre.c#3 integrate .. //depot/projects/tcpecn/net/if_gre.h#2 integrate .. //depot/projects/tcpecn/net/if_iso88025subr.c#3 integrate .. //depot/projects/tcpecn/net/if_loop.c#4 integrate .. //depot/projects/tcpecn/net/if_stf.c#2 integrate .. //depot/projects/tcpecn/net/if_var.h#4 integrate .. //depot/projects/tcpecn/net/radix_mpath.c#2 integrate .. //depot/projects/tcpecn/net/radix_mpath.h#2 integrate .. //depot/projects/tcpecn/net/route.c#6 integrate .. //depot/projects/tcpecn/net/route.h#5 integrate .. //depot/projects/tcpecn/net/rtsock.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211.c#5 integrate .. //depot/projects/tcpecn/net80211/ieee80211.h#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_node.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_var.h#3 integrate .. //depot/projects/tcpecn/netatalk/at_extern.h#2 integrate .. //depot/projects/tcpecn/netatalk/at_proto.c#2 integrate .. //depot/projects/tcpecn/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/tcpecn/netinet/if_atm.c#2 integrate .. //depot/projects/tcpecn/netinet/if_ether.c#4 integrate .. //depot/projects/tcpecn/netinet/in_gif.c#2 integrate .. //depot/projects/tcpecn/netinet/in_mcast.c#3 integrate .. //depot/projects/tcpecn/netinet/in_pcb.c#5 integrate .. //depot/projects/tcpecn/netinet/in_pcb.h#5 integrate .. //depot/projects/tcpecn/netinet/in_rmx.c#3 integrate .. //depot/projects/tcpecn/netinet/in_var.h#2 integrate .. //depot/projects/tcpecn/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_fw.h#4 integrate .. //depot/projects/tcpecn/netinet/ip_fw2.c#7 integrate .. //depot/projects/tcpecn/netinet/ip_icmp.c#3 integrate .. //depot/projects/tcpecn/netinet/ip_input.c#4 integrate .. //depot/projects/tcpecn/netinet/ip_mroute.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_mroute.h#2 integrate .. //depot/projects/tcpecn/netinet/ip_options.c#4 integrate .. //depot/projects/tcpecn/netinet/ip_output.c#5 integrate .. //depot/projects/tcpecn/netinet/ip_var.h#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias.c#3 integrate .. //depot/projects/tcpecn/netinet/raw_ip.c#3 integrate .. //depot/projects/tcpecn/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/tcpecn/netinet/tcp.h#4 integrate .. //depot/projects/tcpecn/netinet/tcp_input.c#7 integrate .. //depot/projects/tcpecn/netinet/tcp_subr.c#5 integrate .. //depot/projects/tcpecn/netinet/tcp_syncache.c#7 integrate .. //depot/projects/tcpecn/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/tcpecn/netinet6/in6.c#5 integrate .. //depot/projects/tcpecn/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/tcpecn/netinet6/in6_rmx.c#4 integrate .. //depot/projects/tcpecn/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/tcpecn/netipx/ipx_proto.c#2 integrate .. //depot/projects/tcpecn/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/tcpecn/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/tcpecn/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/tcpecn/pc98/cbus/sio.c#4 integrate .. //depot/projects/tcpecn/pc98/conf/GENERIC#6 integrate .. //depot/projects/tcpecn/pci/intpm.c#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/tcpecn/security/audit/audit.h#4 integrate .. //depot/projects/tcpecn/sparc64/conf/GENERIC#8 integrate .. //depot/projects/tcpecn/sparc64/include/bus.h#3 integrate .. //depot/projects/tcpecn/sparc64/include/bus_common.h#3 integrate .. //depot/projects/tcpecn/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/tcpecn/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/tcpecn/sparc64/pci/psycho.c#6 integrate .. //depot/projects/tcpecn/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/tcpecn/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/tcpecn/sparc64/sparc64/counter.c#2 integrate .. //depot/projects/tcpecn/sparc64/sparc64/iommu.c#3 integrate .. //depot/projects/tcpecn/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/tcpecn/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/tcpecn/sun4v/include/bus_common.h#2 delete .. //depot/projects/tcpecn/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/tcpecn/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/tcpecn/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/tcpecn/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/tcpecn/sys/blist.h#2 integrate .. //depot/projects/tcpecn/sys/domain.h#2 integrate .. //depot/projects/tcpecn/sys/kdb.h#3 integrate .. //depot/projects/tcpecn/sys/mbuf.h#6 integrate .. //depot/projects/tcpecn/sys/mpt_ioctl.h#1 branch .. //depot/projects/tcpecn/sys/param.h#10 integrate .. //depot/projects/tcpecn/sys/proc.h#8 integrate .. //depot/projects/tcpecn/sys/socket.h#5 integrate .. //depot/projects/tcpecn/sys/socketvar.h#4 integrate .. //depot/projects/tcpecn/sys/syscall.h#7 integrate .. //depot/projects/tcpecn/sys/syscall.mk#7 integrate .. //depot/projects/tcpecn/sys/sysproto.h#7 integrate .. //depot/projects/tcpecn/vm/memguard.c#2 integrate .. //depot/projects/tcpecn/vm/pmap.h#3 integrate .. //depot/projects/tcpecn/vm/swap_pager.c#4 integrate .. //depot/projects/tcpecn/vm/vm_extern.h#2 integrate .. //depot/projects/tcpecn/vm/vm_init.c#3 integrate .. //depot/projects/tcpecn/vm/vm_kern.c#6 integrate .. //depot/projects/tcpecn/vm/vm_map.c#6 integrate .. //depot/projects/tcpecn/vm/vm_map.h#4 integrate .. //depot/user/rwatson/tcpabi/src/sys/netinet/in_pcb.h#5 edit .. //depot/user/rwatson/tcpabi/src/sys/netinet/ip_divert.c#2 edit .. //depot/user/rwatson/tcpabi/src/sys/netinet/ip_fw_nat.c#2 edit Differences ... ==== //depot/projects/tcpecn/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__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.617 2008/05/11 20:33:46 alc Exp $"); /* * Manages physical address maps. @@ -4469,3 +4469,27 @@ 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. + */ +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 (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/tcpecn/amd64/conf/GENERIC#8 (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.497 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $ cpu HAMMER ident GENERIC @@ -235,6 +235,8 @@ # Wireless NIC cards device wlan # 802.11 support +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support ==== //depot/projects/tcpecn/amd64/conf/NOTES#7 (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.78 2008/04/12 14:20:22 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $ # # @@ -302,6 +302,7 @@ # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters +# iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter @@ -313,6 +314,7 @@ options ED_HPP options ED_SIC device iwi +device iwn device ipw device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking ==== //depot/projects/tcpecn/amd64/linux32/linux32_dummy.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__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 #include @@ -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/tcpecn/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/tcpecn/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/tcpecn/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/tcpecn/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/tcpecn/arm/arm/pmap.c#7 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.99 2008/03/06 21:59:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.100 2008/05/09 23:31:41 alc Exp $"); #include #include #include @@ -4355,6 +4355,16 @@ return(addr); } +/* + * 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) +{ +} + /* * Map a set of physical memory pages into the kernel virtual ==== //depot/projects/tcpecn/arm/at91/uart_dev_at91usart.c#3 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $"); #include "opt_comconsole.h" @@ -506,9 +506,20 @@ at91_rx_put(struct uart_softc *sc, int key) { #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) + int kdb_brk; + if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { - if (kdb_alt_break(key, &sc->sc_altbrk)) - kdb_enter(KDB_WHY_BREAK, "Break sequence to console"); + if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) { + case KDB_REQ_DEBUGGER: + kdb_enter(KDB_WHY_BREAK, "Break sequence on console"); + break; + case KDB_REQ_PANIC: + kdb_panic("Panic sequence on console"); + break; + case KDB_REQ_REBOOT: + kdb_reboot(); + break; + } } #endif uart_rx_put(sc, key); ==== //depot/projects/tcpecn/compat/linux/linux_emul.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.20 2007/04/02 18:38:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.21 2008/05/13 20:01:27 rdivacky Exp $"); #include "opt_compat.h" @@ -44,9 +44,6 @@ #include #include -#include -#include - #ifdef COMPAT_LINUX32 #include #include @@ -55,6 +52,9 @@ #include #endif +#include +#include + struct sx emul_shared_lock; struct mtx emul_lock; @@ -86,6 +86,7 @@ em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; em->pdeath_signal = 0; + em->robust_futexes = NULL; if (flags & LINUX_CLONE_THREAD) { /* handled later in the code */ } else { @@ -161,6 +162,8 @@ if (__predict_true(p->p_sysent != &elf_linux_sysvec)) return; + release_futexes(p); + /* find the emuldata */ em = em_find(p, EMUL_DOLOCK); ==== //depot/projects/tcpecn/compat/linux/linux_emul.h#2 (text+ko) ==== @@ -25,12 +25,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.7 2007/04/02 18:38:13 jkim Exp $ + * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.8 2008/05/13 20:01:27 rdivacky Exp $ */ #ifndef _LINUX_EMUL_H_ #define _LINUX_EMUL_H_ +#include + struct linux_emuldata_shared { int refs; pid_t group_pid; @@ -52,6 +54,8 @@ int pdeath_signal; /* parent death signal */ + struct linux_robust_list_head *robust_futexes; + LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; ==== //depot/projects/tcpecn/compat/linux/linux_futex.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.12 2008/03/20 17:03:55 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.13 2008/05/13 20:01:27 rdivacky Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif @@ -45,8 +45,11 @@ #include #include #include +#include #include #include +#include +#include #include #include @@ -57,6 +60,7 @@ #include #include #endif +#include #include struct futex; @@ -533,3 +537,160 @@ return (-ENOSYS); } } + +int +linux_set_robust_list(struct thread *td, struct linux_set_robust_list_args *args) +{ + struct linux_emuldata *em; + +#ifdef DEBUG + if (ldebug(set_robust_list)) + printf(ARGS(set_robust_list, "")); +#endif + if (args->len != sizeof(struct linux_robust_list_head)) + return (EINVAL); + + em = em_find(td->td_proc, EMUL_DOLOCK); + em->robust_futexes = args->head; + EMUL_UNLOCK(&emul_lock); + + return (0); +} + +int +linux_get_robust_list(struct thread *td, struct linux_get_robust_list_args *args) +{ + struct linux_emuldata *em; + struct linux_robust_list_head *head; + l_size_t len = sizeof(struct linux_robust_list_head); + int error = 0; + +#ifdef DEBUG + if (ldebug(get_robust_list)) + printf(ARGS(get_robust_list, "")); +#endif + + if (!args->pid) { + em = em_find(td->td_proc, EMUL_DONTLOCK); + head = em->robust_futexes; + } else { + struct proc *p; + + p = pfind(args->pid); + if (p == NULL) + return (ESRCH); + + em = em_find(p, EMUL_DONTLOCK); + /* XXX: ptrace? */ + if (priv_check(td, PRIV_CRED_SETUID) || + priv_check(td, PRIV_CRED_SETEUID) || + p_candebug(td, p)) + return (EPERM); + head = em->robust_futexes; + + PROC_UNLOCK(p); + } + + error = copyout(&len, args->len, sizeof(l_size_t)); + if (error) + return (EFAULT); + + error = copyout(head, args->head, sizeof(struct linux_robust_list_head)); + + return (error); +} + +static int +handle_futex_death(void *uaddr, pid_t pid, int pi) +{ + int uval, nval, mval; + struct futex *f; + +retry: + if (copyin(uaddr, &uval, 4)) + return (EFAULT); + + if ((uval & FUTEX_TID_MASK) == pid) { + mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED; + nval = casuword32(uaddr, uval, mval); + + if (nval == -1) + return (EFAULT); + + if (nval != uval) + goto retry; + + if (!pi && (uval & FUTEX_WAITERS)) { + f = futex_get(uaddr, FUTEX_UNLOCKED); + futex_wake(f, 1, NULL, 0); + } + } + + return (0); +} + +static int +fetch_robust_entry(struct linux_robust_list **entry, + struct linux_robust_list **head, int *pi) +{ + l_ulong uentry; + + if (copyin((const void *)head, &uentry, sizeof(l_ulong))) + return (EFAULT); + + *entry = (void *)(uentry & ~1UL); + *pi = uentry & 1; + + return (0); +} + +/* This walks the list of robust futexes releasing them. */ +void +release_futexes(struct proc *p) +{ + struct linux_robust_list_head *head = NULL; + struct linux_robust_list *entry, *next_entry, *pending; + unsigned int limit = 2048, pi, next_pi, pip; + struct linux_emuldata *em; + l_ulong futex_offset; + int rc; + + em = em_find(p, EMUL_DONTLOCK); + head = em->robust_futexes; + + if (head == NULL) + return; + + if (fetch_robust_entry(&entry, &head->list.next, &pi)) + return; + + if (copyin(&head->futex_offset, &futex_offset, sizeof(l_ulong))) + return; + + if (fetch_robust_entry(&pending, &head->pending_list, &pip)) + return; + + while (entry != &head->list) { + rc = fetch_robust_entry(&next_entry, &entry->next, &next_pi); + + if (entry != pending) + if (handle_futex_death((char *)entry + futex_offset, + p->p_pid, pi)) + return; + + if (rc) + return; + + entry = next_entry; + pi = next_pi; + + if (!--limit) + break; + + sched_relinquish(curthread); + } + + if (pending) + handle_futex_death((char *) pending + futex_offset, + p->p_pid, pip); +} ==== //depot/projects/tcpecn/compat/linux/linux_futex.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.3 2008/03/20 17:03:55 rdivacky Exp $ + * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.4 2008/05/13 20:01:27 rdivacky Exp $ */ #ifndef _LINUX_FUTEX_H @@ -63,4 +63,22 @@ #define FUTEX_OP_CMP_GT 4 /* if (oldval > CMPARG) wake */ #define FUTEX_OP_CMP_GE 5 /* if (oldval >= CMPARG) wake */ +/* This is defined by Linux user-space */ + +struct linux_robust_list { + struct linux_robust_list *next; +}; + +struct linux_robust_list_head { + struct linux_robust_list list; + l_ulong futex_offset; + struct linux_robust_list *pending_list; +}; + +#define FUTEX_WAITERS 0x80000000 +#define FUTEX_OWNER_DIED 0x40000000 +#define FUTEX_TID_MASK 0x3fffffff + +void release_futexes(struct proc *); + #endif /* !_LINUX_FUTEX_H */ ==== //depot/projects/tcpecn/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.220 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.221 2008/05/13 20:01:27 rdivacky Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -75,10 +75,6 @@ #include #include -#include -#include -#include - #ifdef COMPAT_LINUX32 #include #include @@ -91,6 +87,9 @@ #include #include #include +#include +#include +#include #ifdef __i386__ #include ==== //depot/projects/tcpecn/conf/NOTES#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1485 2008/05/09 23:02:55 julian Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -509,6 +509,8 @@ options INET #Internet communications protocols options INET6 #IPv6 communications protocols +options ROUTETABLES=2 # max 16. 1 is back compatible. + # In order to enable IPSEC you MUST also add device crypto to # your kernel configuration options IPSEC #IP security (requires device crypto) @@ -762,6 +764,8 @@ device ether #Generic Ethernet device vlan #VLAN support (needs miibus) device wlan #802.11 support +options IEEE80211_DEBUG #enable debugging msgs +options IEEE80211_AMPDU_AGE #age frames in AMPDU reorder q's device wlan_wep #802.11 WEP support device wlan_ccmp #802.11 CCMP support device wlan_tkip #802.11 TKIP support @@ -868,7 +872,12 @@ # The MBUF_STRESS_TEST option enables options which create # various random failures / extreme cases related to mbuf # functions. See mbuf(9) for a list of available test cases. +# MBUF_PROFILING enables code to profile the mbuf chains +# exiting the system (via participating interfaces) and +# return a logarithmic histogram of monitored parameters +# (e.g. packet size, wasted space, number of mbufs in chain). options MBUF_STRESS_TEST +options MBUF_PROFILING # Statically Link in accept filters options ACCEPT_FILTER_DATA ==== //depot/projects/tcpecn/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -830,6 +830,21 @@ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \ no-obj no-implicit-rule \ clean "iwi_monitor.fw" +dev/iwn/if_iwn.c optional iwn +iwnfw.c optional iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwnfw.c" +iwnfw.fwo optional iwnfw \ + dependency "iwn.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \ + no-implicit-rule \ + clean "iwn.fwo" +iwn.fw optional iwnfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwn.fw" dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb @@ -916,6 +931,7 @@ dev/mpt/mpt_debug.c optional mpt dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt +dev/mpt/mpt_user.c optional mpt dev/msk/if_msk.c optional msk dev/mxge/if_mxge.c optional mxge pci dev/mxge/mxge_lro.c optional mxge pci ==== //depot/projects/tcpecn/conf/files.powerpc#7 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<