From owner-p4-projects@FreeBSD.ORG Wed Feb 20 18:02:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD69516A411; Wed, 20 Feb 2008 18:02:03 +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 8B64E16A40D for ; Wed, 20 Feb 2008 18:02:03 +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 6E62A13C457 for ; Wed, 20 Feb 2008 18:02:03 +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 m1KI23M5075876 for ; Wed, 20 Feb 2008 18:02:03 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KI1qrw075865 for perforce@freebsd.org; Wed, 20 Feb 2008 18:01:52 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 20 Feb 2008 18:01:52 GMT Message-Id: <200802201801.m1KI1qrw075865@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 135813 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, 20 Feb 2008 18:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=135813 Change 135813 by rpaulo@rpaulo_vmware on 2008/02/20 18:01:19 IFC Affected files ... .. //depot/projects/tcpecn/amd64/acpica/madt.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#5 integrate .. //depot/projects/tcpecn/amd64/conf/NOTES#4 integrate .. //depot/projects/tcpecn/amd64/include/proc.h#2 integrate .. //depot/projects/tcpecn/amd64/include/specialreg.h#3 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/tcpecn/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/arm/arm/genassym.c#2 integrate .. //depot/projects/tcpecn/arm/arm/locore.S#2 integrate .. //depot/projects/tcpecn/arm/arm/pmap.c#5 integrate .. //depot/projects/tcpecn/arm/arm/swtch.S#2 integrate .. //depot/projects/tcpecn/arm/include/asmacros.h#3 integrate .. //depot/projects/tcpecn/arm/include/atomic.h#4 integrate .. //depot/projects/tcpecn/arm/include/pmap.h#2 integrate .. //depot/projects/tcpecn/arm/include/sysarch.h#2 integrate .. //depot/projects/tcpecn/boot/Makefile#2 integrate .. //depot/projects/tcpecn/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/tcpecn/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/tcpecn/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/tcpecn/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/tcpecn/boot/powerpc/uboot/version#1 branch .. //depot/projects/tcpecn/boot/uboot/Makefile#1 branch .. //depot/projects/tcpecn/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/tcpecn/boot/uboot/common/main.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/Makefile#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/console.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/copy.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/disk.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/glue.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/module.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/net.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/tcpecn/boot/uboot/lib/time.c#1 branch .. //depot/projects/tcpecn/cam/cam_periph.c#2 integrate .. //depot/projects/tcpecn/cam/cam_xpt.c#4 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/tcpecn/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/tcpecn/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/tcpecn/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/tcpecn/conf/Makefile.arm#2 integrate .. //depot/projects/tcpecn/conf/NOTES#5 integrate .. //depot/projects/tcpecn/conf/files#5 integrate .. //depot/projects/tcpecn/conf/files.amd64#3 integrate .. //depot/projects/tcpecn/conf/files.i386#3 integrate .. //depot/projects/tcpecn/conf/files.powerpc#3 integrate .. //depot/projects/tcpecn/conf/files.sparc64#3 integrate .. //depot/projects/tcpecn/conf/kern.post.mk#2 integrate .. //depot/projects/tcpecn/conf/kern.pre.mk#2 integrate .. //depot/projects/tcpecn/conf/options#5 integrate .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/tcpecn/ddb/db_capture.c#2 integrate .. //depot/projects/tcpecn/ddb/db_textdump.c#3 integrate .. //depot/projects/tcpecn/dev/acpica/acpi.c#2 integrate .. //depot/projects/tcpecn/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/tcpecn/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/tcpecn/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/tcpecn/dev/amr/amr.c#4 integrate .. //depot/projects/tcpecn/dev/amr/amrreg.h#2 integrate .. //depot/projects/tcpecn/dev/amr/amrvar.h#3 integrate .. //depot/projects/tcpecn/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/tcpecn/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/tcpecn/dev/ciss/ciss.c#2 integrate .. //depot/projects/tcpecn/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/tcpecn/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/tcpecn/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/tcpecn/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/tcpecn/dev/hptrr/array.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/him.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/tcpecn/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/tcpecn/dev/hptrr/ldm.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/list.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/tcpecn/dev/hptrr/osm.h#2 integrate .. //depot/projects/tcpecn/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/tcpecn/dev/lge/if_lge.c#2 integrate .. //depot/projects/tcpecn/dev/mfi/mfi.c#3 integrate .. //depot/projects/tcpecn/dev/mfi/mfireg.h#2 integrate .. //depot/projects/tcpecn/dev/mii/amphy.c#2 integrate .. //depot/projects/tcpecn/dev/mii/miidevs#2 integrate .. //depot/projects/tcpecn/dev/mii/nsphy.c#2 integrate .. //depot/projects/tcpecn/dev/mii/nsphyter.c#1 branch .. //depot/projects/tcpecn/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/tcpecn/dev/msk/if_msk.c#4 integrate .. //depot/projects/tcpecn/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/tcpecn/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/tcpecn/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/tcpecn/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/tcpecn/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/tcpecn/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/tcpecn/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/tcpecn/dev/pci/pci.c#2 integrate .. //depot/projects/tcpecn/dev/ral/rt2560.c#2 integrate .. //depot/projects/tcpecn/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/tcpecn/dev/ral/rt2560var.h#2 integrate .. //depot/projects/tcpecn/dev/rr232x/LICENSE#2 delete .. //depot/projects/tcpecn/dev/rr232x/README#2 delete .. //depot/projects/tcpecn/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/tcpecn/dev/rr232x/array.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/him.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/hptintf.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/tcpecn/dev/rr232x/ldm.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/list.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/tcpecn/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/osm.h#2 delete .. //depot/projects/tcpecn/dev/rr232x/osm_bsd.c#2 delete .. //depot/projects/tcpecn/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/tcpecn/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/tcpecn/dev/sk/if_sk.c#2 integrate .. //depot/projects/tcpecn/dev/sk/if_skreg.h#2 integrate .. //depot/projects/tcpecn/dev/syscons/syscons.c#4 integrate .. //depot/projects/tcpecn/dev/syscons/syscons.h#3 integrate .. //depot/projects/tcpecn/dev/ti/if_ti.c#2 integrate .. //depot/projects/tcpecn/dev/twe/twe.c#2 integrate .. //depot/projects/tcpecn/dev/usb/ehci.c#3 integrate .. //depot/projects/tcpecn/dev/usb/if_udav.c#3 integrate .. //depot/projects/tcpecn/dev/usb/uark.c#2 integrate .. //depot/projects/tcpecn/dev/usb/uftdi.c#2 integrate .. //depot/projects/tcpecn/dev/usb/uftdireg.h#2 integrate .. //depot/projects/tcpecn/dev/usb/usbdi.c#2 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/tcpecn/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/tcpecn/fs/coda/TODO#2 integrate .. //depot/projects/tcpecn/fs/coda/cnode.h#3 integrate .. //depot/projects/tcpecn/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_io.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_kernel.h#2 delete .. //depot/projects/tcpecn/fs/coda/coda_namecache.c#2 delete .. //depot/projects/tcpecn/fs/coda/coda_namecache.h#3 delete .. //depot/projects/tcpecn/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/tcpecn/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_subr.c#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_subr.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_venus.c#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_venus.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/tcpecn/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/tcpecn/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/tcpecn/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/tcpecn/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/tcpecn/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/tcpecn/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/tcpecn/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/tcpecn/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/tcpecn/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/tcpecn/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/tcpecn/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/tcpecn/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/tcpecn/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/tcpecn/geom/geom_disk.c#2 integrate .. //depot/projects/tcpecn/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/tcpecn/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/tcpecn/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/tcpecn/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/tcpecn/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/tcpecn/i386/acpica/madt.c#2 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#5 integrate .. //depot/projects/tcpecn/i386/conf/NOTES#4 integrate .. //depot/projects/tcpecn/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/tcpecn/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/i386/geode.c#2 integrate .. //depot/projects/tcpecn/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/include/proc.h#2 integrate .. //depot/projects/tcpecn/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/tcpecn/ia64/conf/GENERIC#4 integrate .. //depot/projects/tcpecn/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/ia64/ia64/locore.S#2 integrate .. //depot/projects/tcpecn/ia64/ia64/machdep.c#3 integrate .. //depot/projects/tcpecn/ia64/ia64/pmap.c#3 integrate .. //depot/projects/tcpecn/ia64/include/md_var.h#2 integrate .. //depot/projects/tcpecn/kern/init_sysent.c#4 integrate .. //depot/projects/tcpecn/kern/kern_descrip.c#5 integrate .. //depot/projects/tcpecn/kern/kern_exit.c#3 integrate .. //depot/projects/tcpecn/kern/kern_jail.c#3 integrate .. //depot/projects/tcpecn/kern/kern_lock.c#5 integrate .. //depot/projects/tcpecn/kern/kern_mbuf.c#3 integrate .. //depot/projects/tcpecn/kern/kern_mib.c#5 integrate .. //depot/projects/tcpecn/kern/kern_module.c#3 integrate .. //depot/projects/tcpecn/kern/kern_mutex.c#4 integrate .. //depot/projects/tcpecn/kern/kern_rwlock.c#5 integrate .. //depot/projects/tcpecn/kern/kern_shutdown.c#4 integrate .. //depot/projects/tcpecn/kern/kern_tc.c#3 integrate .. //depot/projects/tcpecn/kern/kern_timeout.c#2 integrate .. //depot/projects/tcpecn/kern/subr_autoconf.c#2 integrate .. //depot/projects/tcpecn/kern/subr_bus.c#4 integrate .. //depot/projects/tcpecn/kern/subr_lock.c#4 integrate .. //depot/projects/tcpecn/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/tcpecn/kern/subr_turnstile.c#2 integrate .. //depot/projects/tcpecn/kern/syscalls.c#4 integrate .. //depot/projects/tcpecn/kern/syscalls.master#4 integrate .. //depot/projects/tcpecn/kern/systrace_args.c#4 integrate .. //depot/projects/tcpecn/kern/sysv_shm.c#2 integrate .. //depot/projects/tcpecn/kern/tty_pty.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_cow.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_mbuf.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_shm.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_socket.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_syscalls.c#4 integrate .. //depot/projects/tcpecn/kern/vfs_aio.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_bio.c#5 integrate .. //depot/projects/tcpecn/kern/vfs_default.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#5 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#5 integrate .. //depot/projects/tcpecn/kern/vfs_syscalls.c#4 integrate .. //depot/projects/tcpecn/modules/Makefile#3 integrate .. //depot/projects/tcpecn/modules/coda/Makefile#2 integrate .. //depot/projects/tcpecn/modules/coda5/Makefile#2 integrate .. //depot/projects/tcpecn/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/tcpecn/modules/geom/Makefile#2 integrate .. //depot/projects/tcpecn/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/tcpecn/modules/mii/Makefile#2 integrate .. //depot/projects/tcpecn/modules/rr232x/Makefile#2 delete .. //depot/projects/tcpecn/net/bpf.c#3 integrate .. //depot/projects/tcpecn/net/route.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/tcpecn/net80211/ieee80211_input.c#2 integrate .. //depot/projects/tcpecn/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/tcpecn/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/tcpecn/netgraph/netgraph.h#2 integrate .. //depot/projects/tcpecn/netgraph/ng_base.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_bpf.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_iface.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_ppp.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_pred1.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_tee.c#2 integrate .. //depot/projects/tcpecn/netinet/in.c#2 integrate .. //depot/projects/tcpecn/netinet/in_rmx.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_carp.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_fw.h#2 integrate .. //depot/projects/tcpecn/netinet/ip_fw2.c#3 integrate .. //depot/projects/tcpecn/netinet/ip_id.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_options.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_output.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_auth.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/tcpecn/netinet/sctp_indata.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_input.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_pcb.c#2 integrate .. //depot/projects/tcpecn/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/tcpecn/netinet/sctputil.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6.c#4 integrate .. //depot/projects/tcpecn/netinet6/ip6_output.c#4 integrate .. //depot/projects/tcpecn/netinet6/ip6_var.h#3 integrate .. //depot/projects/tcpecn/netinet6/raw_ip6.c#4 integrate .. //depot/projects/tcpecn/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/tcpecn/netipsec/ipsec.c#3 integrate .. //depot/projects/tcpecn/netipsec/ipsec.h#3 integrate .. //depot/projects/tcpecn/netipsec/ipsec6.h#2 integrate .. //depot/projects/tcpecn/netncp/ncp_conn.c#2 integrate .. //depot/projects/tcpecn/netsmb/smb_conn.c#2 integrate .. //depot/projects/tcpecn/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/tcpecn/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/tcpecn/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/tcpecn/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/tcpecn/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/tcpecn/nfsclient/nfs_node.c#2 integrate .. //depot/projects/tcpecn/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/tcpecn/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/tcpecn/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/tcpecn/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/tcpecn/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/tcpecn/nfsclient/nfsnode.h#2 integrate .. //depot/projects/tcpecn/pci/if_wb.c#2 integrate .. //depot/projects/tcpecn/powerpc/aim/machdep.c#2 integrate .. //depot/projects/tcpecn/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/tcpecn/powerpc/conf/GENERIC#4 integrate .. //depot/projects/tcpecn/powerpc/conf/NOTES#3 integrate .. //depot/projects/tcpecn/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/tcpecn/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/tcpecn/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/tcpecn/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/tcpecn/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/tcpecn/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/tcpecn/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/tcpecn/security/audit/audit.c#3 integrate .. //depot/projects/tcpecn/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/tcpecn/sparc64/include/md_var.h#2 integrate .. //depot/projects/tcpecn/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/tcpecn/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/tcpecn/sys/buf.h#3 integrate .. //depot/projects/tcpecn/sys/bus.h#2 integrate .. //depot/projects/tcpecn/sys/conf.h#2 integrate .. //depot/projects/tcpecn/sys/event.h#2 integrate .. //depot/projects/tcpecn/sys/ipc.h#2 integrate .. //depot/projects/tcpecn/sys/lock.h#2 integrate .. //depot/projects/tcpecn/sys/lockmgr.h#4 integrate .. //depot/projects/tcpecn/sys/mbuf.h#4 integrate .. //depot/projects/tcpecn/sys/module.h#2 integrate .. //depot/projects/tcpecn/sys/param.h#6 integrate .. //depot/projects/tcpecn/sys/priv.h#3 integrate .. //depot/projects/tcpecn/sys/proc.h#4 integrate .. //depot/projects/tcpecn/sys/rwlock.h#2 integrate .. //depot/projects/tcpecn/sys/shm.h#2 integrate .. //depot/projects/tcpecn/sys/socket.h#3 integrate .. //depot/projects/tcpecn/sys/socketvar.h#3 integrate .. //depot/projects/tcpecn/sys/syscall.h#4 integrate .. //depot/projects/tcpecn/sys/syscall.mk#4 integrate .. //depot/projects/tcpecn/sys/syscallsubr.h#3 integrate .. //depot/projects/tcpecn/sys/sysproto.h#4 integrate .. //depot/projects/tcpecn/sys/user.h#4 integrate .. //depot/projects/tcpecn/tools/embed_mfs.sh#1 branch .. //depot/projects/tcpecn/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/tcpecn/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/tcpecn/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/tcpecn/ufs/ufs/ufs_extattr.c#3 integrate Differences ... ==== //depot/projects/tcpecn/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $"); #include #include @@ -109,9 +109,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) @@ -246,7 +248,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) ==== //depot/projects/tcpecn/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); #include #include @@ -598,14 +598,14 @@ * Count the number of bounce pages * needed in order to complete this transfer */ - vaddr = trunc_page((vm_offset_t)buf); + vaddr = (vm_offset_t)buf; vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; - vaddr += PAGE_SIZE; + vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); } CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } ==== //depot/projects/tcpecn/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -140,7 +140,7 @@ ptr += len; sz -= len; if (fragsz == DEV_BSIZE) { - error = di->dumper(di->priv, buffer, 0, dumplo, + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); if (error) return error; @@ -160,7 +160,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; fragsz = 0; return (error); @@ -177,6 +177,7 @@ uint64_t pgs; size_t counter, sz, chunk; int i, c, error, twiddle; + u_int maxdumppgs; error = 0; /* catch case in which chunk size is 0 */ counter = 0; /* Update twiddle every 16MB */ @@ -184,13 +185,16 @@ va = 0; pgs = mdp->md_size / PAGE_SIZE; pa = mdp->md_start; + maxdumppgs = di->maxiosize / PAGE_SIZE; + if (maxdumppgs == 0) /* seatbelt */ + maxdumppgs = 1; printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs); while (pgs) { chunk = pgs; - if (chunk > MAXDUMPPGS) - chunk = MAXDUMPPGS; + if (chunk > maxdumppgs) + chunk = maxdumppgs; sz = chunk << PAGE_SHIFT; counter += sz; if (counter >> 24) { @@ -201,7 +205,7 @@ a = pa + i * PAGE_SIZE; va = pmap_kenter_temporary(trunc_page(a), i); } - error = di->dumper(di->priv, va, 0, dumplo, sz); + error = dump_write(di, va, 0, dumplo, sz); if (error) break; dumplo += sz; @@ -327,7 +331,7 @@ ehdr.e_phnum); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -358,12 +362,12 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/tcpecn/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.155 2007/12/08 21:13:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.157 2008/02/02 23:17:27 das Exp $"); #include "opt_cpu.h" @@ -223,7 +223,7 @@ "\020" "\001SSE3" /* SSE3 */ "\002" - "\003RSVD2" /* "Reserved" bit 2 */ + "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ @@ -240,11 +240,11 @@ "\021" "\022" "\023DCA" /* Direct Cache Access */ - "\024" - "\025" - "\026" + "\024SSE4.1" + "\025SSE4.2" + "\026x2APIC" /* xAPIC Extensions */ "\027" - "\030" + "\030POPCNT" "\031" "\032" "\033" ==== //depot/projects/tcpecn/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -111,7 +111,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, dump_va, 0, dumplo, fragsz); + error = dump_write(di, dump_va, 0, dumplo, fragsz); dumplo += fragsz; fragsz = 0; return (error); @@ -122,7 +122,11 @@ { size_t len; int error, i, c; + u_int maxdumpsz; + maxdumpsz = di->maxiosize; + if (maxdumpsz == 0) /* seatbelt */ + maxdumpsz = PAGE_SIZE; error = 0; if ((sz % PAGE_SIZE) != 0) { printf("size not page aligned\n"); @@ -143,7 +147,7 @@ return (error); } while (sz) { - len = (MAXDUMPPGS * PAGE_SIZE) - fragsz; + len = maxdumpsz - fragsz; if (len > sz) len = sz; counter += len; @@ -153,7 +157,7 @@ counter &= (1<<24) - 1; } if (ptr) { - error = di->dumper(di->priv, ptr, 0, dumplo, len); + error = dump_write(di, ptr, 0, dumplo, len); if (error) return (error); dumplo += len; @@ -165,7 +169,7 @@ fragsz += len; pa += len; sz -= len; - if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) { + if (fragsz == maxdumpsz) { error = blk_flush(di); if (error) return (error); @@ -284,7 +288,7 @@ printf("Dumping %llu MB:", (long long)dumpsize >> 20); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -375,13 +379,13 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/tcpecn/amd64/conf/GENERIC#5 (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.491 2008/01/07 21:40:09 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.493 2008/02/19 06:30:49 ru Exp $ cpu HAMMER ident GENERIC @@ -30,7 +30,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -options SCTP # Stream Control Transmission Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -116,7 +116,6 @@ device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters - # SCSI peripherals device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers @@ -133,7 +132,6 @@ device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx -device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/tcpecn/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.75 2008/02/03 07:07:30 scottl Exp $ # # @@ -381,11 +381,6 @@ device hptrr # -# Highpoint RocketRAID 232x. This is software RAID but with hardware -# acceleration assistance for RAID_5. -device rr232x - -# # Highpoint RocketRaid 3xxx series SATA RAID device hptiop ==== //depot/projects/tcpecn/amd64/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.25 2008/01/31 08:24:27 mav Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -44,4 +44,17 @@ struct mdproc { }; +#ifdef _KERNEL + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE; \ + (used) = (char *)td->td_kstack + \ + td->td_kstack_pages * PAGE_SIZE - \ + (char *)&td; \ +} while (0) + +#endif /* _KERNEL */ + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/tcpecn/amd64/include/specialreg.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.41 2007/12/08 21:13:01 alc Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.43 2008/02/02 23:17:27 das Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -113,6 +113,7 @@ #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 +#define CPUID2_DTES64 0x00000004 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 #define CPUID2_VMX 0x00000020 @@ -125,6 +126,10 @@ #define CPUID2_XTPR 0x00004000 #define CPUID2_PDCM 0x00008000 #define CPUID2_DCA 0x00040000 +#define CPUID2_SSE41 0x00080000 +#define CPUID2_SSE42 0x00100000 +#define CPUID2_X2APIC 0x00200000 +#define CPUID2_POPCNT 0x00800000 /* * Important bits in the AMD extended cpuid flags ==== //depot/projects/tcpecn/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.46 2008/02/11 19:35:03 jkim Exp $"); #include #include @@ -907,21 +907,22 @@ PROC_UNLOCK(p); } - /* This gives us our maximum stack size */ - if (linux_args->len > STACK_SIZE - GUARD_SIZE) - bsd_args.len = linux_args->len; - else - bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* - * This gives us a new BOS. If we're using VM_STACK, then - * mmap will just map the top SGROWSIZ bytes, and let - * the stack grow down to the limit at BOS. If we're - * not using VM_STACK we map the full stack, since we - * don't have a way to autogrow it. + * This gives us our maximum stack size and a new BOS. + * If we're using VM_STACK, then mmap will just map + * the top SGROWSIZ bytes, and let the stack grow down + * to the limit at BOS. If we're not using VM_STACK + * we map the full stack, since we don't have a way + * to autogrow it. */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - - bsd_args.len; + if (linux_args->len > STACK_SIZE - GUARD_SIZE) { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); + bsd_args.len = linux_args->len; + } else { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + (STACK_SIZE - GUARD_SIZE - linux_args->len); + bsd_args.len = STACK_SIZE - GUARD_SIZE; + } } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; ==== //depot/projects/tcpecn/arm/arm/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.2 2005/10/03 14:05:03 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); #include #include @@ -138,7 +138,7 @@ ptr += len; sz -= len; if (fragsz == DEV_BSIZE) { - error = di->dumper(di->priv, buffer, 0, dumplo, + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); if (error) return error; @@ -158,7 +158,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; fragsz = 0; return (error); @@ -207,7 +207,7 @@ cpu_tlb_flushID_SE(0); cpu_cpwait(); } - error = di->dumper(di->priv, + error = dump_write(di, (void *)(pa - (pa & L1_ADDR_BITS)),0, dumplo, sz); if (error) break; @@ -330,7 +330,7 @@ ehdr.e_phnum); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -361,12 +361,12 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/tcpecn/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.10 2007/08/08 09:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $"); #include #include #include @@ -102,6 +102,8 @@ ASSYM(P_FLAG, offsetof(struct proc, p_flag)); ASSYM(ARM_TP_ADDRESS, ARM_TP_ADDRESS); +ASSYM(ARM_RAS_START, ARM_RAS_START); +ASSYM(ARM_RAS_END, ARM_RAS_END); ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(PDESIZE, PDESIZE); ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL); ==== //depot/projects/tcpecn/arm/arm/locore.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.18 2008/02/05 10:23:42 raj Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -69,7 +69,7 @@ #if defined (FLASHADDR) && defined(LOADERRAMADDR) /* Check if we're running from flash. */ ldr r7, =FLASHADDR - /* + /* * If we're running with MMU disabled, test against the * physical address instead. */ @@ -88,7 +88,7 @@ bls from_ram do_copy: ldr r9, =KERNBASE - adr r1, _start + adr r1, _start ldr r0, Lreal_start ldr r2, Lend sub r2, r2, r0 @@ -105,7 +105,7 @@ adr r7, Lunmapped bic r7, r7, #0xff000000 orr r7, r7, #PHYSADDR - + disable_mmu: /* Disable MMU for a while */ @@ -170,7 +170,7 @@ ldr pc, .Lvirt_done virt_done: - mov fp, #0 /* trace back starts here */ + mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ @@ -180,7 +180,7 @@ adr r0, .Lmainreturned b _C_LABEL(panic) - /* NOTEACHED */ + /* NOTREACHED */ #ifdef STARTUP_PAGETABLE_ADDR #define MMU_INIT(va,pa,n_sec,attr) \ .word n_sec ; \ @@ -229,9 +229,6 @@ .text .align 0 -#ifndef OFW - /* OFW based systems will used OF_boot() */ - .Lcpufuncs: .word _C_LABEL(cpufuncs) @@ -260,7 +257,7 @@ mov r2, #0 /* - * MMU & IDC off, 32 bit program & data space + * MMU & IDC off, 32 bit program & data space * Hurl ourselves into the ROM */ mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE) @@ -285,7 +282,6 @@ .Lcpu_reset_needs_v4_MMU_disable: .word _C_LABEL(cpu_reset_needs_v4_MMU_disable) -#endif /* OFW */ #ifdef IPKDB /* ==== //depot/projects/tcpecn/arm/arm/pmap.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.97 2008/01/17 12:41:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.98 2008/01/31 00:05:40 cognet Exp $"); #include #include #include @@ -199,11 +199,8 @@ static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t, int); -static void pmap_vac_me_harder(struct vm_page *, pmap_t, - vm_offset_t); -static void pmap_vac_me_kpmap(struct vm_page *, pmap_t, +static __inline void pmap_fix_cache(struct vm_page *, pmap_t, vm_offset_t); -static void pmap_vac_me_user(struct vm_page *, pmap_t, vm_offset_t); static void pmap_alloc_l1(pmap_t); static void pmap_free_l1(pmap_t); >>> TRUNCATED FOR MAIL (1000 lines) <<<