From owner-p4-projects Sun Dec 29 12:33:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 828A337B405; Sun, 29 Dec 2002 12:32:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1738337B401 for ; Sun, 29 Dec 2002 12:32:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7EF643EA9 for ; Sun, 29 Dec 2002 12:32:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBTKWsfh028912 for ; Sun, 29 Dec 2002 12:32:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTKWhrN028909 for perforce@freebsd.org; Sun, 29 Dec 2002 12:32:43 -0800 (PST) Date: Sun, 29 Dec 2002 12:32:43 -0800 (PST) Message-Id: <200212292032.gBTKWhrN028909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 22889 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22889 Change 22889 by rwatson@rwatson_paprika on 2002/12/29 12:31:44 Integ TrustedBSD ACL tree from TrustedBSD base. Affected files ... .. //depot/projects/trustedbsd/acl/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/alpha/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/arm/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/efi/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_an.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/asr/asr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/umass.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_dev.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_io.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_kern.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ia64/include/dig64.h#1 branch .. //depot/projects/trustedbsd/acl/sys/ia64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/isa/fd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/init_main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_event.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_exec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_fork.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_jail.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_sig.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_switch.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_synch.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_time.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_smp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_trap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_witness.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sys_socket.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/tty_pty.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_export.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vnode_if.src#2 integrate .. //depot/projects/trustedbsd/acl/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bpf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bpf_compat.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bridge.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_ef.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/net_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/radix.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/radix.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/raw_cb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/route.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatalk/at_control.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/atm_if.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/in.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_fw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netkey/keysock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/agp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_ste.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_stereg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_xl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/_iovec.h#1 branch .. //depot/projects/trustedbsd/acl/sys/sys/_types.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/file.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/ipc.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/mount.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/msg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/proc.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/types.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/uio.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/vnode.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/phys_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/swap_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_contig.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_fault.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_glue.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_kern.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_page.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_pager.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/x86_64/include/limits.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/acl/sys/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.115 2002/12/14 22:25:35 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.117 2002/12/28 22:47:45 alc Exp $ */ /* @@ -1011,9 +1011,11 @@ if (oldpte) pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); + vm_page_lock_queues(); vm_page_wakeup(m); vm_page_flag_clear(m, PG_ZERO); m->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); } } @@ -1309,13 +1311,12 @@ * allocate the page directory page */ lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); - lev1pg->wire_count = 1; - ++cnt.v_wire_count; - + vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); lev1pg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); if ((lev1pg->flags & PG_ZERO) == 0) @@ -1437,15 +1438,11 @@ * Find or fabricate a new pagetable page */ m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_ZERO | VM_ALLOC_RETRY); + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); - if (m->wire_count == 0) - cnt.v_wire_count++; - m->wire_count++; - /* * Increment the hold count for the page table page * (denoting a new mapping.) @@ -1489,9 +1486,11 @@ if ((m->flags & PG_ZERO) == 0) bzero((caddr_t) ALPHA_PHYS_TO_K0SEG(ptepa), PAGE_SIZE); + vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); + vm_page_unlock_queues(); return m; } ==== //depot/projects/trustedbsd/acl/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -32,14 +32,13 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.9 2002/07/29 17:41:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.10 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by ==== //depot/projects/trustedbsd/acl/sys/arm/include/limits.h#2 (text+ko) ==== @@ -31,14 +31,13 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.2 2002/07/29 17:41:07 mike Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.3 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by ==== //depot/projects/trustedbsd/acl/sys/boot/alpha/common/conf.c#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/boot/alpha/common/conf.c,v 1.3 2000/05/01 17:41:17 bp Exp $ + * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ #include @@ -65,7 +65,7 @@ #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/arc/loader/conf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.3 2000/05/01 17:41:21 bp Exp $ + * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ * From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ @@ -55,7 +55,7 @@ struct fs_ops *file_system[] = { &ufs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/efi/loader/conf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.7 2002/07/20 03:46:43 peter Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.8 2002/12/19 19:34:58 jake Exp $"; #endif /* not lint */ #include @@ -62,7 +62,7 @@ &efi_fsops, /* &ufs_fsops, */ &nfs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/efi/loader/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.16 2002/12/10 20:11:20 marcel Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.17 2002/12/18 08:13:03 marcel Exp $"; #endif /* not lint */ #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -495,3 +496,77 @@ return print_trs(1); } +COMMAND_SET(hcdp, "hcdp", "Dump HCDP info", command_hcdp); + +static char * +hcdp_string(char *s, u_int len) +{ + static char buffer[256]; + + memcpy(buffer, s, len); + buffer[len] = 0; + return (buffer); +} + +static int +command_hcdp(int argc, char *argv[]) +{ + struct dig64_hcdp_table *tbl; + struct dig64_hcdp_entry *ent; + struct dig64_gas *gas; + int i; + + tbl = efi_get_table(&hcdp); + if (tbl == NULL) { + printf("No HCDP table present\n"); + return (CMD_OK); + } + if (memcmp(tbl->signature, HCDP_SIGNATURE, sizeof(tbl->signature))) { + printf("HCDP table has invalid signature\n"); + return (CMD_OK); + } + if (tbl->length < sizeof(*tbl) - sizeof(*tbl->entry)) { + printf("HCDP table too short\n"); + return (CMD_OK); + } + printf("HCDP table at 0x%016lx\n", (u_long)tbl); + printf("Signature = %s\n", hcdp_string(tbl->signature, 4)); + printf("Length = %u\n", tbl->length); + printf("Revision = %u\n", tbl->revision); + printf("Checksum = %u\n", tbl->checksum); + printf("OEM Id = %s\n", hcdp_string(tbl->oem_id, 6)); + printf("Table Id = %s\n", hcdp_string(tbl->oem_tbl_id, 8)); + printf("OEM rev = %u\n", tbl->oem_rev); + printf("Creator Id = %s\n", hcdp_string(tbl->creator_id, 4)); + printf("Creator rev= %u\n", tbl->creator_rev); + printf("Entries = %u\n", tbl->entries); + for (i = 0; i < tbl->entries; i++) { + ent = tbl->entry + i; + printf("Entry #%d:\n", i + 1); + printf(" Type = %u\n", ent->type); + printf(" Databits = %u\n", ent->databits); + printf(" Parity = %u\n", ent->parity); + printf(" Stopbits = %u\n", ent->stopbits); + printf(" PCI seg = %u\n", ent->pci_segment); + printf(" PCI bus = %u\n", ent->pci_bus); + printf(" PCI dev = %u\n", ent->pci_device); + printf(" PCI func = %u\n", ent->pci_function); + printf(" Interrupt = %u\n", ent->interrupt); + printf(" PCI flag = %u\n", ent->pci_flag); + printf(" Baudrate = %lu\n", + ((u_long)ent->baud_high << 32) + (u_long)ent->baud_low); + gas = &ent->address; + printf(" Addr space= %u\n", gas->addr_space); + printf(" Bit width = %u\n", gas->bit_width); + printf(" Bit offset= %u\n", gas->bit_offset); + printf(" Address = 0x%016lx\n", + ((u_long)gas->addr_high << 32) + (u_long)gas->addr_low); + printf(" PCI type = %u\n", ent->pci_devid); + printf(" PCI vndr = %u\n", ent->pci_vendor); + printf(" IRQ = %u\n", ent->irq); + printf(" PClock = %u\n", ent->pclock); + printf(" PCI iface = %u\n", ent->pci_interface); + } + printf("\n"); + return (CMD_OK); +} ==== //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.42 2002/12/17 21:10:34 imp Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.44 2002/12/21 02:03:31 obrien Exp $ PROG= boot2 NOMAN= @@ -36,6 +36,7 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability -fomit-frame-pointer\ + -mno-align-long-strings \ -mrtd \ -D${BOOT2_UFS} \ -I${.CURDIR}/../../common \ @@ -61,6 +62,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp ${AS} ${AFLAGS} -o boot2.o boot2.s boot2.h: boot1.out ==== //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.59 2002/12/17 22:00:06 imp Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.60 2002/12/20 05:49:40 imp Exp $ */ #include @@ -133,7 +133,7 @@ strcmp(const char *s1, const char *s2) { for (; *s1 == *s2 && *s1; s1++, s2++); - return *s1 - *s2; + return (unsigned char)*s1 - (unsigned char)*s2; } #include "ufsread.c" ==== //depot/projects/trustedbsd/acl/sys/boot/i386/loader/conf.c#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/boot/i386/loader/conf.c,v 1.21 2002/08/29 02:02:28 peter Exp $ + * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.22 2002/12/19 19:34:59 jake Exp $ */ #include @@ -62,7 +62,7 @@ &cd9660_fsops, &splitfs_fsops, #ifdef LOADER_GZIP_SUPPORT - &zipfs_fsops, + &gzipfs_fsops, #endif #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, ==== //depot/projects/trustedbsd/acl/sys/boot/ia64/skiload/conf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; + "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.2 2002/12/19 19:34:59 jake Exp $"; #endif /* not lint */ #include @@ -58,7 +58,7 @@ struct fs_ops *file_system[] = { &ski_fsops, &ufs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/powerpc/loader/conf.c#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/boot/powerpc/loader/conf.c,v 1.7 2001/10/07 13:22:25 benno Exp $ + * $FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.8 2002/12/19 19:34:59 jake Exp $ */ #include @@ -68,7 +68,7 @@ #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.14 2002/11/10 19:17:36 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.15 2002/12/20 04:32:10 jake Exp $ BASE= loader PROG= ${BASE} @@ -16,7 +16,6 @@ LOADER_NET_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= yes -LOADER_ZIP_SUPPORT?= yes LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= no @@ -29,9 +28,6 @@ .if ${LOADER_CD9660_SUPPORT} == "yes" CFLAGS+= -DLOADER_CD9660_SUPPORT .endif -.if ${LOADER_ZIP_SUPPORT} == "yes" -CFLAGS+= -DLOADER_ZIP_SUPPORT -.endif .if ${LOADER_GZIP_SUPPORT} == "yes" CFLAGS+= -DLOADER_GZIP_SUPPORT .endif ==== //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/main.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.17 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.18 2002/12/19 19:34:59 jake Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -106,8 +106,11 @@ #ifdef LOADER_CD9660_SUPPORT &cd9660_fsops, #endif +#ifdef LOADER_ZIP_SUPPORT + &zipfs_fsops, +#endif #ifdef LOADER_GZIP_SUPPORT - &zipfs_fsops, + &gzipfs_fsops, #endif #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, ==== //depot/projects/trustedbsd/acl/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.117 2002/12/12 18:09:35 yar Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.118 2002/12/18 21:47:52 njl Exp $ */ #ifdef _KERNEL @@ -420,6 +420,14 @@ */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "HP", "USB CAMERA", "*"}, /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * Fujitsu-Siemens Memorybird pen drive + * PR: kern/34712 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Fujitsu", "Memorybird", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; ==== //depot/projects/trustedbsd/acl/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.59 2002/10/21 22:27:36 julian Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.60 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -725,6 +725,7 @@ "bytes packets errs drop fifo frame compressed", "bytes packets errs drop fifo frame compressed"); + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); sbuf_printf(sb, "%6.6s:", ifname); @@ -733,6 +734,7 @@ sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n", 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL); } + IFNET_RUNLOCK(); return (0); } ==== //depot/projects/trustedbsd/acl/sys/compat/linux/linux_ioctl.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (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_ioctl.c,v 1.95 2002/10/19 21:11:43 marcel Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.96 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -1907,12 +1907,16 @@ /* Determine the (relative) unit number for ethernet interfaces */ ethno = 0; + IFNET_RLOCK(); TAILQ_FOREACH(ifscan, &ifnet, if_link) { - if (ifscan == ifp) + if (ifscan == ifp) { + IFNET_RUNLOCK(); return (snprintf(buffer, buflen, "eth%d", ethno)); + } if (IFP_IS_ETH(ifscan)) ethno++; } + IFNET_RUNLOCK(); return (0); } @@ -1942,6 +1946,7 @@ return (NULL); index = 0; is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0; + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { /* * Allow Linux programs to use FreeBSD names. Don't presume @@ -1954,6 +1959,7 @@ if (is_eth && IFP_IS_ETH(ifp) && unit == index++) break; } + IFNET_RUNLOCK(); if (ifp != NULL) snprintf(bsdname, IFNAMSIZ, "%s%d", ifp->if_name, ifp->if_unit); return (ifp); @@ -1993,6 +1999,7 @@ ethno = 0; /* Return all AF_INET addresses of all interfaces */ + IFNET_RLOCK(); /* could sleep XXX */ TAILQ_FOREACH(ifp, &ifnet, if_link) { if (uio.uio_resid <= 0) break; @@ -2019,11 +2026,14 @@ error = uiomove((caddr_t)&ifr, sizeof ifr, &uio); - if (error != 0) + if (error != 0) { + IFNET_RUNLOCK(); return (error); + } } } } + IFNET_RUNLOCK(); ifc.ifc_len -= uio.uio_resid; error = copyout(&ifc, uifc, sizeof ifc); ==== //depot/projects/trustedbsd/acl/sys/compat/svr4/svr4_sockio.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/svr4/svr4_sockio.c,v 1.13 2002/10/17 22:27:21 robert Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.14 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -100,7 +100,7 @@ * fix is to make SVR4_SIOCGIFCONF return only one * entry per physical interface? */ - + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) if (TAILQ_FIRST(&ifp->if_addrhead) == NULL) ifnum++; @@ -108,8 +108,7 @@ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) ifnum++; - - + IFNET_RUNLOCK(); DPRINTF(("SIOCGIFNUM %d\n", ifnum)); return copyout(&ifnum, data, sizeof(ifnum)); } ==== //depot/projects/trustedbsd/acl/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -99,7 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.32 2002/08/28 13:41:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.33 2002/12/22 05:35:01 hsu Exp $"; #endif #ifndef _KERNEL @@ -1963,6 +1963,9 @@ (defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)) # if (NetBSD >= 199905) || defined(__OpenBSD__) for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_list.tqe_next) +# elif defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &ifnet, if_link) # else for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_link.tqe_next) # endif @@ -1973,6 +1976,9 @@ ip_natsync(ifp); ip_statesync(ifp); } +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RUNLOCK(); +# endif ip_natsync((struct ifnet *)-1); # endif /* !SOLARIS */ ==== //depot/projects/trustedbsd/acl/sys/ddb/db_command.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_command.c,v 1.46 2002/10/01 21:59:46 phk Exp $ + * $FreeBSD: src/sys/ddb/db_command.c,v 1.47 2002/12/28 01:23:06 julian Exp $ */ /* @@ -383,9 +383,7 @@ { "all", 0, 0, db_show_all_cmds }, { "registers", db_show_regs, 0, 0 }, { "breaks", db_listbreak_cmd, 0, 0 }, -#if 0 { "thread", db_show_one_thread, 0, 0 }, -#endif #if 0 { "port", ipc_port_print, 0, 0 }, #endif ==== //depot/projects/trustedbsd/acl/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.35 2002/10/21 22:27:36 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.36 2002/12/28 01:23:06 julian Exp $ */ #include #include @@ -38,8 +38,13 @@ #include #include #include +#include +#include +#include #include +static void +dumpthread(volatile struct proc *p, volatile struct thread *td); void db_ps(dummy1, dummy2, dummy3, dummy4) @@ -123,58 +128,7 @@ if (p->p_flag & P_KSES) db_printf("(threaded) %s\n", p->p_comm); FOREACH_THREAD_IN_PROC(p, td) { - if (p->p_flag & P_KSES) - db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); - if (TD_ON_SLEEPQ(td)) { - if (td->td_flags & TDF_CVWAITQ) - db_printf("[CVQ "); - else - db_printf("[SLPQ "); - db_printf(" %6s %8p]", td->td_wmesg, - (void *)td->td_wchan); - } - switch (td->td_state) { - case TDS_INHIBITED: - if (TD_ON_LOCK(td)) { - db_printf("[LOCK %6s %8p]", - td->td_lockname, - (void *)td->td_blocked); - } - if (TD_IS_SLEEPING(td)) { - db_printf("[SLP]"); - } - if (TD_IS_SWAPPED(td)) { - db_printf("[SWAP]"); - } - if (TD_IS_SUSPENDED(td)) { - db_printf("[SUSP]"); - } - if (TD_AWAITING_INTR(td)) { - db_printf("[IWAIT]"); - } - if (TD_LENT(td)) { - db_printf("[LOAN]"); - } - break; - case TDS_CAN_RUN: - db_printf("[Can run]"); - break; - case TDS_RUNQ: - db_printf("[RUNQ]"); - break; - case TDS_RUNNING: - db_printf("[CPU %d]", td->td_kse->ke_oncpu); - break; - default: - panic("unknown thread state"); - } - if (p->p_flag & P_KSES) { - if (td->td_kse) - db_printf("[kse %p]", td->td_kse); - db_printf("\n"); - } else - db_printf(" %s\n", p->p_comm); - + dumpthread(p, td); } /* PROC_UNLOCK(p); */ @@ -184,3 +138,90 @@ } /* sx_sunlock(&allproc_lock); */ } +static void +dumpthread(volatile struct proc *p, volatile struct thread *td) +{ + if (p->p_flag & P_KSES) + db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); + if (TD_ON_SLEEPQ(td)) { + if (td->td_flags & TDF_CVWAITQ) + db_printf("[CVQ "); + else + db_printf("[SLPQ "); + db_printf(" %6s %8p]", td->td_wmesg, + (void *)td->td_wchan); + } + switch (td->td_state) { + case TDS_INHIBITED: + if (TD_ON_LOCK(td)) { + db_printf("[LOCK %6s %8p]", + td->td_lockname, + (void *)td->td_blocked); + } + if (TD_IS_SLEEPING(td)) { + db_printf("[SLP]"); + } + if (TD_IS_SWAPPED(td)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message