From owner-p4-projects@FreeBSD.ORG Sun Jan 25 18:11:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AAE716A4D0; Sun, 25 Jan 2004 18:11:35 -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 F3EC916A4CE for ; Sun, 25 Jan 2004 18:11:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E2B943D45 for ; Sun, 25 Jan 2004 18:11:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0Q2BV0B048438 for ; Sun, 25 Jan 2004 18:11:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0Q2BSNq048384 for perforce@freebsd.org; Sun, 25 Jan 2004 18:11:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 25 Jan 2004 18:11:28 -0800 (PST) Message-Id: <200401260211.i0Q2BSNq048384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 45900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jan 2004 02:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=45900 Change 45900 by jmallett@jmallett_oingo on 2004/01/25 18:11:18 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#20 integrate .. //depot/projects/mips/bin/ls/print.c#9 integrate .. //depot/projects/mips/bin/ps/ps.1#6 integrate .. //depot/projects/mips/bin/sh/Makefile#3 integrate .. //depot/projects/mips/bin/sh/eval.c#4 integrate .. //depot/projects/mips/bin/sh/input.c#3 integrate .. //depot/projects/mips/bin/sh/parser.c#4 integrate .. //depot/projects/mips/bin/sh/redir.c#3 integrate .. //depot/projects/mips/bin/sh/redir.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/mips/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/mips/contrib/bsnmp/README#2 integrate .. //depot/projects/mips/contrib/bsnmp/TODO#2 integrate .. //depot/projects/mips/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/mips/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/server.c#4 integrate .. //depot/projects/mips/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/mips/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/mips/contrib/isc-dhcp/FREEBSD-upgrade#4 integrate .. //depot/projects/mips/contrib/isc-dhcp/client/dhclient.c#5 integrate .. //depot/projects/mips/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/mips/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/mips/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/mips/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/mips/etc/Makefile#13 integrate .. //depot/projects/mips/etc/defaults/devfs.rules#2 integrate .. //depot/projects/mips/etc/isdn/Makefile#3 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#11 integrate .. //depot/projects/mips/etc/mtree/BSD.var.dist#5 integrate .. //depot/projects/mips/etc/pccard_ether#5 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#10 integrate .. //depot/projects/mips/etc/rc.subr#8 integrate .. //depot/projects/mips/etc/rc.suspend#3 integrate .. //depot/projects/mips/etc/sendmail/Makefile#3 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#8 integrate .. //depot/projects/mips/lib/csu/i386-elf/Makefile#4 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libbsnmp/libbsnmp/Makefile#3 integrate .. //depot/projects/mips/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/genfiles#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/genfiles#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/mips/lib/libc/Makefile#9 integrate .. //depot/projects/mips/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/mips/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/mips/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/printf.3#5 integrate .. //depot/projects/mips/lib/libc/stdio/vfwprintf.c#10 integrate .. //depot/projects/mips/lib/libc/stdlib/random.c#4 integrate .. //depot/projects/mips/lib/libc/sys/gettimeofday.2#5 integrate .. //depot/projects/mips/lib/libc/sys/read.2#4 integrate .. //depot/projects/mips/lib/libc/xdr/xdr_stdio.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/pthread_private.h#8 integrate .. //depot/projects/mips/lib/libfetch/fetch.3#8 integrate .. //depot/projects/mips/lib/libsdp/Makefile#2 integrate .. //depot/projects/mips/lib/libsdp/sdp.3#3 integrate .. //depot/projects/mips/lib/libsdp/sdp.h#3 integrate .. //depot/projects/mips/lib/libsdp/search.c#3 integrate .. //depot/projects/mips/lib/libsdp/service.c#1 branch .. //depot/projects/mips/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/mips/lib/libstand/dosfs.c#2 integrate .. //depot/projects/mips/lib/libstand/ext2fs.c#2 integrate .. //depot/projects/mips/lib/libstand/fstat.c#2 integrate .. //depot/projects/mips/lib/libstand/gzipfs.c#3 integrate .. //depot/projects/mips/lib/libstand/nfs.c#3 integrate .. //depot/projects/mips/lib/libstand/nullfs.c#2 integrate .. //depot/projects/mips/lib/libstand/read.c#2 integrate .. //depot/projects/mips/lib/libstand/splitfs.c#3 integrate .. //depot/projects/mips/lib/libstand/ufs.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_exit.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_spinlock.c#5 integrate .. //depot/projects/mips/release/Makefile#23 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#15 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/mips/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/mips/sbin/atm/fore_dnld/fore_dnld.c#3 integrate .. //depot/projects/mips/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/mips/sbin/devfs/devfs.c#2 integrate .. //depot/projects/mips/sbin/devfs/rule.c#2 integrate .. //depot/projects/mips/sbin/ffsinfo/ffsinfo.8#3 integrate .. //depot/projects/mips/sbin/growfs/growfs.8#7 integrate .. //depot/projects/mips/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/mips/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/mips/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/mips/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/mips/sbin/sconfig/Makefile#2 integrate .. //depot/projects/mips/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/mips/share/Makefile#4 integrate .. //depot/projects/mips/share/doc/papers/Makefile#3 integrate .. //depot/projects/mips/share/doc/psd/Makefile#2 integrate .. //depot/projects/mips/share/doc/smm/Makefile#2 integrate .. //depot/projects/mips/share/doc/usd/Makefile#3 integrate .. //depot/projects/mips/share/examples/cvsup/cvs-supfile#6 integrate .. //depot/projects/mips/share/examples/cvsup/ports-supfile#5 integrate .. //depot/projects/mips/share/man/man1/Makefile#2 integrate .. //depot/projects/mips/share/man/man3/Makefile#4 integrate .. //depot/projects/mips/share/man/man3/pthread_spin_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_spin_lock.3#1 branch .. //depot/projects/mips/share/man/man4/Makefile#21 integrate .. //depot/projects/mips/share/man/man4/ata.4#6 integrate .. //depot/projects/mips/share/man/man4/gdb.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#10 integrate .. //depot/projects/mips/share/man/man4/ng_one2many.4#3 integrate .. //depot/projects/mips/share/man/man4/random.4#3 integrate .. //depot/projects/mips/share/man/man4/tdfx.4#2 integrate .. //depot/projects/mips/share/man/man4/uplcom.4#3 integrate .. //depot/projects/mips/share/man/man4/witness.4#2 integrate .. //depot/projects/mips/share/man/man5/Makefile#6 integrate .. //depot/projects/mips/share/man/man6/intro.6#2 integrate .. //depot/projects/mips/share/man/man7/Makefile#5 integrate .. //depot/projects/mips/share/man/man8/Makefile#6 integrate .. //depot/projects/mips/share/man/man8/yp.8#3 integrate .. //depot/projects/mips/share/man/man9/MUTEX_PROFILING.9#1 branch .. //depot/projects/mips/share/man/man9/Makefile#14 integrate .. //depot/projects/mips/share/man/man9/ifnet.9#6 integrate .. //depot/projects/mips/share/man/man9/mac.9#5 integrate .. //depot/projects/mips/share/man/man9/mbuf.9#10 integrate .. //depot/projects/mips/share/man/man9/mutex.9#7 integrate .. //depot/projects/mips/share/man/man9/sbuf.9#4 integrate .. //depot/projects/mips/share/man/man9/zone.9#5 integrate .. //depot/projects/mips/share/skel/Makefile#2 integrate .. //depot/projects/mips/share/syscons/fonts/Makefile#4 integrate .. //depot/projects/mips/share/syscons/keymaps/Makefile#6 integrate .. //depot/projects/mips/share/syscons/keymaps/it.iso.kbd#3 integrate .. //depot/projects/mips/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/mips/share/termcap/termcap.src#5 integrate .. //depot/projects/mips/sys/alpha/alpha/support.s#4 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/mips/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/mips/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/mips/sys/conf/NOTES#21 integrate .. //depot/projects/mips/sys/conf/files.i386#17 integrate .. //depot/projects/mips/sys/conf/files.pc98#17 integrate .. //depot/projects/mips/sys/conf/files.powerpc#8 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#13 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/mips/sys/conf/options.i386#15 integrate .. //depot/projects/mips/sys/conf/options.powerpc#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/mips/sys/dev/amd/amd.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#17 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#15 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#12 integrate .. //depot/projects/mips/sys/dev/fb/fbreg.h#6 integrate .. //depot/projects/mips/sys/dev/firewire/fwdev.c#9 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#19 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#15 integrate .. //depot/projects/mips/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/mips/sys/dev/isp/isp.c#6 integrate .. //depot/projects/mips/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/mips/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/mips/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_pci.c#5 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#12 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#12 integrate .. //depot/projects/mips/sys/dev/sound/pcm/ac97.c#13 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/mips/sys/dev/sound/pcm/vchan.c#8 integrate .. //depot/projects/mips/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/schistory.c#5 integrate .. //depot/projects/mips/sys/dev/syscons/scterm-dumb.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#15 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#16 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#16 integrate .. //depot/projects/mips/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/mips/sys/geom/geom_dev.c#16 integrate .. //depot/projects/mips/sys/geom/geom_disk.c#17 integrate .. //depot/projects/mips/sys/geom/geom_event.c#12 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#18 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/mips/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#18 integrate .. //depot/projects/mips/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/mips/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/mips/sys/i386/i386/longrun.c#1 branch .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/mips/sys/i386/i386/p4tcc.c#2 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/mips/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/mips/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/mips/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/mips/sys/ia64/ia64/trap.c#13 integrate .. //depot/projects/mips/sys/isofs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/mips/sys/kern/kern_condvar.c#13 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#18 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#20 integrate .. //depot/projects/mips/sys/kern/kern_idle.c#6 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#13 integrate .. //depot/projects/mips/sys/kern/kern_jail.c#8 integrate .. //depot/projects/mips/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/mips/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/mips/sys/kern/kern_ntptime.c#5 integrate .. //depot/projects/mips/sys/kern/kern_poll.c#5 integrate .. //depot/projects/mips/sys/kern/kern_prot.c#9 integrate .. //depot/projects/mips/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#17 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#11 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#16 integrate .. //depot/projects/mips/sys/kern/kern_tc.c#10 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#21 integrate .. //depot/projects/mips/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/mips/sys/kern/sched_ule.c#12 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#8 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#15 integrate .. //depot/projects/mips/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#18 integrate .. //depot/projects/mips/sys/kern/sys_generic.c#7 integrate .. //depot/projects/mips/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/mips/sys/modules/firewire/Makefile#4 integrate .. //depot/projects/mips/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/mips/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/mips/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/mips/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/mips/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/mips/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/mips/sys/net/if.c#10 integrate .. //depot/projects/mips/sys/net/if_media.h#5 integrate .. //depot/projects/mips/sys/net/if_ppp.c#10 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/mips/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/mips/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/mips/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/mips/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/mips/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/mips/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/mips/sys/netkey/key.c#8 integrate .. //depot/projects/mips/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/mips/sys/pci/if_rl.c#14 integrate .. //depot/projects/mips/sys/pci/if_sk.c#9 integrate .. //depot/projects/mips/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/mips/sys/powerpc/include/float.h#3 integrate .. //depot/projects/mips/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/mips/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/mips/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/mips/sys/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#15 integrate .. //depot/projects/mips/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/mips/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/mips/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/mips/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/mips/sys/sys/_mutex.h#4 integrate .. //depot/projects/mips/sys/sys/_task.h#1 branch .. //depot/projects/mips/sys/sys/jail.h#3 integrate .. //depot/projects/mips/sys/sys/proc.h#22 integrate .. //depot/projects/mips/sys/sys/systm.h#10 integrate .. //depot/projects/mips/sys/sys/taskqueue.h#4 integrate .. //depot/projects/mips/sys/sys/user.h#9 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#10 integrate .. //depot/projects/mips/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/mips/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/mips/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/mips/tools/tools/crypto/Makefile#6 integrate .. //depot/projects/mips/tools/tools/crypto/cryptotest.c#4 delete .. //depot/projects/mips/tools/tools/tinderbox/etc/Makefile#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/current.rc#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/experimental.rc#3 delete .. //depot/projects/mips/tools/tools/tinderbox/etc/releng_5.rc#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/stanley.rc#2 delete .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.1#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#8 integrate .. //depot/projects/mips/tools/tools/tinderbox/tinderbox.1#4 integrate .. //depot/projects/mips/tools/tools/tinderbox/tinderbox.pl#8 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/Makefile#4 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/mips/usr.bin/fetch/fetch.1#7 integrate .. //depot/projects/mips/usr.bin/find/ls.c#3 integrate .. //depot/projects/mips/usr.bin/killall/killall.c#7 integrate .. //depot/projects/mips/usr.bin/locale/locale.c#3 integrate .. //depot/projects/mips/usr.bin/lock/lock.c#4 integrate .. //depot/projects/mips/usr.bin/make/make.1#5 integrate .. //depot/projects/mips/usr.bin/make/str.c#5 integrate .. //depot/projects/mips/usr.bin/mklocale/mklocale.1#7 integrate .. //depot/projects/mips/usr.bin/script/script.1#3 integrate .. //depot/projects/mips/usr.bin/script/script.c#2 integrate .. //depot/projects/mips/usr.bin/uuencode/uuencode.c#4 integrate .. //depot/projects/mips/usr.sbin/Makefile#15 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.8#5 integrate .. //depot/projects/mips/usr.sbin/apm/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/apm/apm.8#5 integrate .. //depot/projects/mips/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/apmd/apmd.8#5 integrate .. //depot/projects/mips/usr.sbin/bluetooth/Makefile#6 integrate .. //depot/projects/mips/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c#3 integrate .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/Makefile#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/bgd.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/dun.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ftrn.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/irmc.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/irmc_command.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/lan.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/log.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/log.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/main.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/opush.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/profile.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/profile.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/provider.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/provider.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sar.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/scr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sd.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sdpd.8#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/server.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/server.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sp.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/srr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ssar.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ssr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sur.c#1 branch .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/genfiles#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/oid.h#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/tree.c#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/tree.h#2 delete .. //depot/projects/mips/usr.sbin/chkgrp/chkgrp.8#2 integrate .. //depot/projects/mips/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/mips/usr.sbin/getfmac/getfmac.c#2 integrate .. //depot/projects/mips/usr.sbin/getpmac/getpmac.c#2 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnd/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnmonitor/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/kldxref/kldxref.8#3 integrate .. //depot/projects/mips/usr.sbin/mixer/mixer.c#6 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#4 integrate .. //depot/projects/mips/usr.sbin/ofwdump/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/ofwdump/ofwdump.8#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/mips/usr.sbin/ppp/arp.c#2 integrate .. //depot/projects/mips/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/mips/usr.sbin/repquota/repquota.c#4 integrate .. //depot/projects/mips/usr.sbin/sa/main.c#3 integrate .. //depot/projects/mips/usr.sbin/syslogd/syslogd.c#9 integrate .. //depot/projects/mips/usr.sbin/watch/watch.c#4 integrate .. //depot/projects/mips/usr.sbin/wlconfig/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/wlconfig/wlconfig.8#2 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.401 2004/01/17 01:24:13 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.403 2004/01/23 16:22:48 harti Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -93,7 +93,7 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work +# etc must be last for install/distribute to work .if exists(${.CURDIR}/etc) SUBDIR+= etc .endif @@ -432,13 +432,6 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding man page indices" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}/share/man; ${MAKE} makedb -.endif redistribute: @echo "--------------------------------------------------------------" @@ -658,6 +651,10 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 501114 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif @@ -678,6 +675,7 @@ ${_yacc} \ usr.sbin/config \ ${_crunchgen} \ + ${_gensnmptree} \ ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/mips/bin/ls/print.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.66 2003/10/16 07:07:20 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.67 2004/01/22 04:33:00 cperciva Exp $"); #include #include @@ -624,9 +624,9 @@ unit = unit_adjust(&dbytes); if (dbytes == 0) - (void)printf("%*s ", (u_int)width, "0B"); + (void)printf("%*s ", 4, "0B"); else - (void)printf("%*.*f%c ", (u_int)width - 1, + (void)printf("%*.*f%c ", 3, dbytes > 10 ? 0 : 1, dbytes, "BKMGTPE"[unit]); } else (void)printf("%*jd ", (u_int)width, bytes); ==== //depot/projects/mips/bin/ps/ps.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.65 2003/09/08 19:57:13 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.66 2004/01/21 16:25:36 cperciva Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -211,24 +211,30 @@ The flags associated with the process as in the include file .In sys/proc.h : -.Bl -column P_NOCLDSTOP P_NOCLDSTOP +.Bl -column P_STOPPED_SINGLE 0x4000000 .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" -.It Dv "P_INMEM" Ta No "0x00004 Loaded into memory" -.It Dv "P_NOCLDSTOP" Ta No "0x00008 No SIGCHLD when children stop" +.It Dv "P_KTHREAD" Ta No "0x00004 Kernel thread" +.It Dv "P_NOLOAD" Ta No "0x00008 Ignore during load avg calculations" .It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit" .It Dv "P_PROFIL" Ta No "0x00020 Has started profiling" -.It Dv "P_SELECT" Ta No "0x00040 Selecting; wakeup/waiting danger" -.It Dv "P_SINTR" Ta No "0x00080 Sleep is interruptible" +.It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof" .It Dv "P_SUGID" Ta No "0x00100 Had set id privileges since last exec" .It Dv "P_SYSTEM" Ta No "0x00200 System proc: no sigs, stats or swapping" -.It Dv "P_TIMEOUT" Ta No "0x00400 Timing out during sleep" +.It Dv "P_SINGLE_EXIT" Ta No "0x00400 Threads suspending should exit, not wait" .It Dv "P_TRACED" Ta No "0x00800 Debugged process being traced" -.It Dv "P_WAITED" Ta No "0x01000 Debugging process has waited for child" +.It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_OWEUPC" Ta No "0x20000 Owe process an addupc() call at next ast" -.It Dv "P_SWAPPING" Ta No "0x40000 Process is being swapped" +.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" +.It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" +.It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" +.It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" +.It Dv "P_STOPPED_SINGLE" Ta No "0x80000 Only one thread can continue" +.It Dv "P_PROTECTED" Ta No "0x100000 Do not kill on memory overcommit" +.It Dv "P_SIGEVENT" Ta No "0x200000 Process pending signals changed" +.It Dv "P_JAILED" Ta No "0x1000000 Process is in jail" +.It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()" .El .It label The MAC label of the process. @@ -271,11 +277,6 @@ Marks a process in disk (or other short term, uninterruptible) wait. .It I Marks a process that is idle (sleeping for longer than about 20 seconds). -.It J -Marks a process which is in -.Xr jail 2 . -The hostname of the prison can be found in -.Ql /proc//status . .It L Marks a process that is waiting to acquire a lock. .It R @@ -284,6 +285,8 @@ Marks a process that is sleeping for less than about 20 seconds. .It T Marks a stopped process. +.It W +Marks an idle interrupt thread. .It Z Marks a dead process (a ``zombie''). .El @@ -298,18 +301,13 @@ The process has raised .Tn CPU scheduling priority. -.It > -The process has specified a soft limit on memory requirements and is -currently exceeding that limit; such a process is (necessarily) not -swapped. -.It A -the process has asked for random page replacement -.Pf ( Dv MADV_RANDOM , -from -.Xr madvise 2 , -for example, lisp in a garbage collect). .It E The process is trying to exit. +.It J +Marks a process which is in +.Xr jail 2 . +The hostname of the prison can be found in +.Ql /proc//status . .It L The process has pages locked in core (for example, for raw .Tn I/O ) . @@ -318,15 +316,6 @@ .Tn CPU scheduling priority (see .Xr setpriority 2 ) . -.It S -The process has asked for -.Tn FIFO -page replacement -.Pf ( Dv MADV_SEQUENTIAL , -from -.Xr madvise 2 , -for example, a large image processing program using virtual memory to -sequentially address voluminous data). .It s The process is a session leader. .It V ==== //depot/projects/mips/bin/sh/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.40 2003/05/02 06:26:32 obrien Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.41 2004/01/20 13:13:40 ru Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -7,7 +7,7 @@ mystring.c options.c output.c parser.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c init.c nodes.c syntax.c -GENHDRS= builtins.h nodes.h syntax.h token.h y.tab.h +GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h # MLINKS for Shell built in commands for which there are no userland ==== //depot/projects/mips/bin/sh/eval.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.40 2004/01/21 12:50:01 des Exp $"); #include #include @@ -479,16 +479,14 @@ if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) { INTON; if (prevfd > 0) { - close(0); - copyfd(prevfd, 0); + dup2(prevfd, 0); close(prevfd); } if (pip[1] >= 0) { if (!(prevfd >= 0 && pip[0] == 0)) close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } } @@ -545,8 +543,7 @@ FORCEINTON; close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } evaltree(n, EV_EXIT); @@ -742,8 +739,7 @@ FORCEINTON; close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } } ==== //depot/projects/mips/bin/sh/input.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.20 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.21 2004/01/21 12:50:01 des Exp $"); #include /* defines BUFSIZ */ #include @@ -388,7 +388,7 @@ if ((fd = open(fname, O_RDONLY)) < 0) error("Can't open %s: %s", fname, strerror(errno)); if (fd < 10) { - fd2 = copyfd(fd, 10); + fd2 = fcntl(fd, F_DUPFD, 10); close(fd); if (fd2 < 0) error("Out of file descriptors"); ==== //depot/projects/mips/bin/sh/parser.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.49 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.50 2004/01/21 12:50:01 des Exp $"); #include @@ -48,7 +48,6 @@ #include "parser.h" #include "nodes.h" #include "expand.h" /* defines rmescapes() */ -#include "redir.h" /* defines copyfd() */ #include "syntax.h" #include "options.h" #include "input.h" ==== //depot/projects/mips/bin/sh/redir.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.24 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.25 2004/01/21 12:50:01 des Exp $"); #include #include @@ -182,8 +182,7 @@ error("cannot open %s: %s", fname, strerror(errno)); movefd: if (f != fd) { - close(fd); - copyfd(f, fd); + dup2(f, fd); close(f); } break; @@ -215,12 +214,11 @@ if (redir->ndup.dupfd >= 0) { /* if not ">&-" */ if (memory[redir->ndup.dupfd]) memory[fd] = 1; - else { - close(fd); - copyfd(redir->ndup.dupfd, fd); - } - } else + else + dup2(redir->ndup.dupfd, fd); + } else { close(fd); + } break; case NHERE: case NXHERE: @@ -288,10 +286,11 @@ if (rp->renamed[i] != EMPTY) { if (i == 0) fd0_redirected--; - close(i); if (rp->renamed[i] >= 0) { - copyfd(rp->renamed[i], i); + dup2(rp->renamed[i], i); close(rp->renamed[i]); + } else { + close(i); } } } @@ -346,26 +345,3 @@ } } } - - - -/* - * Copy a file descriptor to be >= to. Returns -1 - * if the source file descriptor is closed, EMPTY if there are no unused - * file descriptors left. - */ - -int -copyfd(int from, int to) -{ - int newfd; - - newfd = fcntl(from, F_DUPFD, to); - if (newfd < 0) { - if (errno == EMFILE) - return EMPTY; - else - error("%d: %s", from, strerror(errno)); - } - return newfd; -} ==== //depot/projects/mips/bin/sh/redir.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)redir.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/redir.h,v 1.8 2002/02/02 06:50:47 imp Exp $ + * $FreeBSD: src/bin/sh/redir.h,v 1.9 2004/01/21 12:50:01 des Exp $ */ /* flags passed to redirect */ @@ -46,5 +46,4 @@ void popredir(void); int fd0_redirected_p(void); void clearredir(void); -int copyfd(int, int); ==== //depot/projects/mips/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,24 @@ +09-Dec-2003 + First step on factoring out the transport mapping stuff into + loadable modules. + + Local stream sockets that check the clients privileges. + +03-Dec-2003 + Bump version to 1.5 but leave library version intact. + +03-Dec-2003 + Now works with libbegemot polling stuff instead of libisc. + Use --with-libbegemot[=path] to configure. + +03-Dec-2003 + Fix parsing of non-minimal ASN.1 integers. They are now disallowed. + Non-minimal lengths are allowed. + + Remove copyright clause 3 everywhere. + + Make an autoconf build infrastructure. + 08-Nov-2003 WARNS=6 fixed. ==== //depot/projects/mips/contrib/bsnmp/README#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Mon Nov 10 09:50:22 CET 2003 +Fri Dec 5 15:01:16 CET 2003 This is a mini-SNMP daemon. The basic daemon implements the system group and a number of private extensions to manage the UDP transport mapping, @@ -13,16 +13,16 @@ Installation ------------ -You need to apply the patch in the patches directory to your system sources. -This adds a sysctl to retrieve multicast address information from the kernel. - As usual by doing: - make obj ; make depend ; make ; make install + configure [--with-libbegemot[=path]] + make + make install This does not install a configuration file. The standard location for the configuration is /etc/snmpd.config, but can be overwritten on the command -line. An example configuration file is provided. +line. An example configuration file is provided. Use --with-libbegemot +to use libbegemot instead of libisc. Running ------- ==== //depot/projects/mips/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,5 +1,17 @@ snmpd_mibII: - handle HC counters by periodically polling the kernel counters. -snmpd_netgraph: - - make some tables writeable +snmpd: + - rethink transports a little bit: make them loadable and make + a private subtree for transports: + OK. Table not writeable yet. + + There should be a transport table that is indexed by the transport name. + This table can be used to load/unload transports at run time. + OK. Table not writeable yet. + + Then there can be a port table that is indexed by transport name and + port name. Plus a transport-specific table indexed by port name only. + + The transport table could contain a column of type OID that points + to the transport-specific table. ==== //depot/projects/mips/contrib/bsnmp/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.4 +1.5a ==== //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.1 2002/08/15 13:27:44 hbb Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.2 2003/12/03 09:56:57 hbb Exp $ .\" .\" Author: Harti Brandt .\" ==== //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.34 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.36 2003/12/03 09:56:57 hbb Exp $ * * Generate OID table from table description. * ==== //depot/projects/mips/contrib/bsnmp/lib/asn1.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/asn1.3,v 1.2 2002/08/16 10:02:53 hbb Exp $ +.\" $Begemot: bsnmp/lib/asn1.3,v 1.3 2003/12/02 15:45:48 hbb Exp $ .\" .Dd August 15, 2002 .Dt asn1 3 ==== //depot/projects/mips/contrib/bsnmp/lib/asn1.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.24 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.27 2003/12/08 17:11:58 hbb Exp $ * * ASN.1 for SNMP. */ @@ -244,6 +244,13 @@ err = ASN_ERR_OK; if (len > 8) err = ASN_ERR_RANGE; + else if (len > 1 && + ((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) || + (*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) { + asn_error(b, "non-minimal integer"); + err = ASN_ERR_BADLEN; + } + if (*b->asn_cptr & 0x80) neg = 1; val = 0; @@ -332,6 +339,10 @@ /* negative integer or too larger */ *vp = 0xffffffffffffffffULL; err = ASN_ERR_RANGE; + } else if (len > 1 && + *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) { + asn_error(b, "non-minimal unsigned"); + err = ASN_ERR_BADLEN; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 25 19:46:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5738616A4D0; Sun, 25 Jan 2004 19:46:32 -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 2995116A4CE for ; Sun, 25 Jan 2004 19:46:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC63843D54 for ; Sun, 25 Jan 2004 19:46:25 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0Q3kP0B069483 for ; Sun, 25 Jan 2004 19:46:25 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0Q3kPlY069480 for perforce@freebsd.org; Sun, 25 Jan 2004 19:46:25 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 25 Jan 2004 19:46:25 -0800 (PST) Message-Id: <200401260346.i0Q3kPlY069480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 45901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jan 2004 03:46:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=45901 Change 45901 by jmallett@jmallett_oingo on 2004/01/25 19:45:25 Print valid/invalid per-entry. Affected files ... .. //depot/projects/mips/sys/mips/mips/db_interface.c#13 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_interface.c#13 (text+ko) ==== @@ -296,12 +296,14 @@ printf("PageMask=%#lx\n", pm); if (*modif != 'a' && (((lo[0] | lo[1]) & PG_V) == 0)) continue; - printf("\tEntryLo0 = 0x%016lx (%c%c)\n", lo[0], + printf("\tEntryLo0 = 0x%016lx (%c%c%c)\n", lo[0], (lo[0] & PG_D) ? 'D' : ' ', - (lo[0] & PG_G) ? 'G' : ' '); - printf("\tEntryLo1 = 0x%016lx (%c%c)\n", lo[1], + (lo[0] & PG_G) ? 'G' : ' ', + (lo[0] & PG_V) ? 'V' : '!'); + printf("\tEntryLo1 = 0x%016lx (%c%c%c)\n", lo[1], (lo[1] & PG_D) ? 'D' : ' ', - (lo[1] & PG_G) ? 'G' : ' '); + (lo[1] & PG_G) ? 'G' : ' ', + (lo[1] & PG_V) ? 'V' : '!'); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 26 13:43:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B23516A4D0; Mon, 26 Jan 2004 13:43:04 -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 259D416A4CE for ; Mon, 26 Jan 2004 13:43:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D0FD43D41 for ; Mon, 26 Jan 2004 13:43:02 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0QLh20B050911 for ; Mon, 26 Jan 2004 13:43:02 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0QLh2D7050908 for perforce@freebsd.org; Mon, 26 Jan 2004 13:43:02 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 26 Jan 2004 13:43:02 -0800 (PST) Message-Id: <200401262143.i0QLh2D7050908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 45956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jan 2004 21:43:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=45956 Change 45956 by jhb@jhb_slimer on 2004/01/26 13:42:20 Compile. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#61 edit .. //depot/projects/smpng/sys/kern/subr_smp.c#27 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#61 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -645,7 +646,6 @@ sched_setup(dummy) void *dummy; { - callout_init(&loadav_callout, 0); callout_init(&lbolt_callout, CALLOUT_MPSAFE); /* Kick off timeout driven events by calling first time. */ ==== //depot/projects/smpng/sys/kern/subr_smp.c#27 (text+ko) ==== @@ -268,7 +268,7 @@ atomic_store_rel_int(&started_cpus, map); /* wait for each to clear its bit */ - while (stopped_cpus & map) != 0) { + while ((stopped_cpus & map) != 0) { #ifdef __i386__ ia32_pause(); #endif From owner-p4-projects@FreeBSD.ORG Mon Oct 20 16:32:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7233516A4C0; Mon, 20 Oct 2003 16:32:17 -0700 (PDT) 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 4CBC916A4B3 for ; Mon, 20 Oct 2003 16:32:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6043243FE3 for ; Mon, 20 Oct 2003 16:32:16 -0700 (PDT) (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.9/8.12.9) with ESMTP id h9KNWGXJ099399 for ; Mon, 20 Oct 2003 16:32:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9KNWFCq099396 for perforce@freebsd.org; Mon, 20 Oct 2003 16:32:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Message-Id: <200310202332.h9KNWFCq099396@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 To: Perforce Change Reviews Subject: PERFORCE change 40039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Mon, 20 Oct 2003 23:32:17 -0000 X-Original-Date: Mon, 20 Oct 2003 16:32:15 -0700 (PDT) X-List-Received-Date: Mon, 20 Oct 2003 23:32:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=40039 Change 40039 by rwatson@rwatson_tislabs on 2003/10/20 16:31:28 Remember to include opt_posix.h Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#4 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.99 2003/09/29 18:35:17 rwatson Exp $"); #include "opt_mac.h" +#include "opt_posix.h" #include #include From owner-p4-projects@FreeBSD.ORG Wed Oct 22 13:34:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 803FC16A4C0; Wed, 22 Oct 2003 13:34:37 -0700 (PDT) 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 5698816A4B3 for ; Wed, 22 Oct 2003 13:34:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9DEF43F3F for ; Wed, 22 Oct 2003 13:34:36 -0700 (PDT) (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.9/8.12.9) with ESMTP id h9MKYaXJ023356 for ; Wed, 22 Oct 2003 13:34:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9MKYaN9023353 for perforce@freebsd.org; Wed, 22 Oct 2003 13:34:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Message-Id: <200310222034.h9MKYaN9023353@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 To: Perforce Change Reviews Subject: PERFORCE change 40198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 22 Oct 2003 20:34:37 -0000 X-Original-Date: Wed, 22 Oct 2003 13:34:36 -0700 (PDT) X-List-Received-Date: Wed, 22 Oct 2003 20:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=40198 Change 40198 by rwatson@rwatson_paprika on 2003/10/22 13:34:19 Alphabetize. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#93 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#93 (text+ko) ==== @@ -1588,7 +1588,6 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores -security/mac/mac_vfs.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_posix_sem.c optional mac @@ -1597,6 +1596,7 @@ security/mac/mac_sysv_msg.c optional mac security/mac/mac_sysv_sem.c optional mac security/mac/mac_sysv_shm.c optional mac +security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended security/mac_ifoff/mac_ifoff.c optional mac_ifoff From owner-p4-projects@FreeBSD.ORG Wed Oct 22 19:34:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09CE916A4C0; Wed, 22 Oct 2003 19:34:49 -0700 (PDT) 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 BE77B16A4B3 for ; Wed, 22 Oct 2003 19:34:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 109AF43F85 for ; Wed, 22 Oct 2003 19:34:48 -0700 (PDT) (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.9/8.12.9) with ESMTP id h9N2YlXJ059443 for ; Wed, 22 Oct 2003 19:34:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9N2Ylbo059440 for perforce@freebsd.org; Wed, 22 Oct 2003 19:34:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Message-Id: <200310230234.h9N2Ylbo059440@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 To: Perforce Change Reviews Subject: PERFORCE change 40244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Thu, 23 Oct 2003 02:34:49 -0000 X-Original-Date: Wed, 22 Oct 2003 19:34:47 -0700 (PDT) X-List-Received-Date: Thu, 23 Oct 2003 02:34:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=40244 Change 40244 by rwatson@rwatson_paprika on 2003/10/22 19:33:51 Integrate trustedbsd_sebsd tools tree forward to 39070, the last major integration of the trustedbsd_mac branch, which brings in many of the major changes in the last four months to the main FreeBSD tree. This includes substantial lock pushdown, threading bug fixes, compiler upgrades, et al. Add ministat, tinderbox fixes. Affected files ... .. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats.c#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/README#1 branch .. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/chameleon#1 branch .. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/iguana#1 branch .. //depot/projects/trustedbsd/sebsd/tools/tools/ministat/ministat.c#1 branch .. //depot/projects/trustedbsd/sebsd/tools/tools/mtxstat/mtxstat.pl#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/powerpc.diff#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tbmaster.pl#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tinderbox.pl#3 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.1 2003/06/28 18:26:23 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.2 2003/09/19 17:18:32 sam Exp $ */ /* @@ -59,6 +59,7 @@ #include #include "../../../sys/contrib/dev/ath/ah_desc.h" +#include "../../../sys/net80211/ieee80211_radiotap.h" #include "../../../sys/dev/ath/if_athioctl.h" static const struct { ==== //depot/projects/trustedbsd/sebsd/tools/tools/mtxstat/mtxstat.pl#2 (text+ko) ==== @@ -26,7 +26,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/tools/tools/mtxstat/mtxstat.pl,v 1.1 2002/05/26 12:02:36 des Exp $ +# $FreeBSD: src/tools/tools/mtxstat/mtxstat.pl,v 1.2 2003/09/19 21:52:29 sam Exp $ # use strict; @@ -53,7 +53,7 @@ if ($opts{'a'}) { usage() if ($opts{'c'} || $opts{'m'} || $opts{'t'}); - $key = 'average'; + $key = 'avg'; } elsif ($opts{'c'}) { usage() if ($opts{'m'} || $opts{'t'}); @@ -98,7 +98,7 @@ } $data{$name}->{'total'} += $entry{'total'}; $data{$name}->{'count'} += $entry{'count'}; - $data{$name}->{'average'} = + $data{$name}->{'avg'} = $data{$name}->{'total'} / $data{$name}->{'count'}; } else { $data{$name} = \%entry; @@ -120,11 +120,11 @@ } } foreach (@list) { - printf("%12.0f %12.0f %12.0f %12.0f %s\n", + printf("%6.0f %12.0f %11.0f %5.0f %-40.40s\n", $data{$_}->{'max'}, $data{$_}->{'total'}, $data{$_}->{'count'}, - $data{$_}->{'average'}, + $data{$_}->{'avg'}, $data{$_}->{'name'}); } } ==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/powerpc.diff#2 (text+ko) ==== @@ -1,12 +1,12 @@ -$FreeBSD: src/tools/tools/tinderbox/powerpc.diff,v 1.2 2003/08/01 21:54:35 des Exp $ +$FreeBSD: src/tools/tools/tinderbox/powerpc.diff,v 1.3 2003/09/09 07:01:13 des Exp $ Index: contrib/gcc/config/rs6000/freebsd.h =================================================================== -RCS file: /usr/home/ncvs/src/contrib/gcc/config/rs6000/freebsd.h,v +RCS file: /home/ncvs/src/contrib/gcc/config/rs6000/freebsd.h,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 freebsd.h --- contrib/gcc/config/rs6000/freebsd.h 11 Jul 2003 03:40:53 -0000 1.1.1.2 -+++ contrib/gcc/config/rs6000/freebsd.h 15 Jul 2003 22:17:12 -0000 ++++ contrib/gcc/config/rs6000/freebsd.h 9 Sep 2003 06:51:49 -0000 @@ -43,6 +43,23 @@ #undef LINK_SHLIB_SPEC #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}" @@ -31,13 +31,23 @@ /************************[ Target stuff ]***********************************/ +@@ -58,6 +75,9 @@ + + #undef WCHAR_TYPE_SIZE + #define WCHAR_TYPE_SIZE 32 ++ ++#undef DEFAULT_SIGNED_CHAR ++#define DEFAULT_SIGNED_CHAR 1 + + #undef TARGET_VERSION + #define TARGET_VERSION fprintf (stderr, " (FreeBSD/PowerPC ELF)"); Index: contrib/gcc/config/rs6000/sysv4.h =================================================================== -RCS file: /usr/home/ncvs/src/contrib/gcc/config/rs6000/sysv4.h,v +RCS file: /home/ncvs/src/contrib/gcc/config/rs6000/sysv4.h,v retrieving revision 1.1.1.6 diff -u -r1.1.1.6 sysv4.h --- contrib/gcc/config/rs6000/sysv4.h 11 Jul 2003 03:40:53 -0000 1.1.1.6 -+++ contrib/gcc/config/rs6000/sysv4.h 15 Jul 2003 20:35:39 -0000 ++++ contrib/gcc/config/rs6000/sysv4.h 9 Sep 2003 06:51:49 -0000 @@ -21,8 +21,6 @@ Boston, MA 02111-1307, USA. */ ==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tbmaster.pl#3 (text+ko) ==== @@ -26,7 +26,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/tools/tools/tinderbox/tbmaster.pl,v 1.34 2003/08/01 21:15:28 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tbmaster.pl,v 1.35 2003/09/19 09:15:10 des Exp $ # use 5.006_001; @@ -358,11 +358,19 @@ die("Where is the tinderbox script?\n"); } + my $stopfile = expand('SANDBOX') . "/stop"; foreach my $branch (@{$CONFIG{'BRANCHES'}}) { foreach my $platform (@{$CONFIG{'PLATFORMS'}}) { + if (-e $stopfile || -e "$stopfile.$config") { + die("stop file found, aborting\n"); + } my ($arch, $machine) = split('/', $platform, 2); $machine = $arch unless defined($machine); + if (-e "$stopfile.$arch" || -e "$stopfile.$arch.$machine") { + warn("stop file for $arch/$machine found, skipping\n"); + next; + } tinderbox($branch, $arch, $machine); } } ==== //depot/projects/trustedbsd/sebsd/tools/tools/tinderbox/tinderbox.pl#3 (text+ko) ==== @@ -26,7 +26,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/tools/tools/tinderbox/tinderbox.pl,v 1.20 2003/05/17 14:12:48 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.21 2003/09/19 09:12:32 des Exp $ # use 5.006_001; @@ -480,7 +480,7 @@ $ENV{$key} = $userenv{$key}; } } - if ($verbose > 1) { + if ($verbose && $verbose > 1) { foreach my $key (sort(keys(%ENV))) { message("$key=$ENV{$key}\n"); } From owner-p4-projects@FreeBSD.ORG Fri Nov 7 09:34:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1841116A4D0; Fri, 7 Nov 2003 09:34:50 -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 E786D16A4CE for ; Fri, 7 Nov 2003 09:34:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42DD64401E for ; Fri, 7 Nov 2003 09:34:49 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA7HYnXJ063661 for ; Fri, 7 Nov 2003 09:34:49 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA7HYmvP063658 for perforce@freebsd.org; Fri, 7 Nov 2003 09:34:48 -0800 (PST) (envelope-from areisse@nailabs.com) Message-Id: <200311071734.hA7HYmvP063658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 41647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Fri, 07 Nov 2003 17:34:50 -0000 X-Original-Date: Fri, 7 Nov 2003 09:34:48 -0800 (PST) X-List-Received-Date: Fri, 07 Nov 2003 17:34:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=41647 Change 41647 by areisse@areisse_ibook on 2003/11/07 09:34:11 sebsd doesn't leak (as much) memory Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/linux-compat.h#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/sebsd.c#9 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/security.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/linux-compat.h#5 (text+ko) ==== @@ -119,10 +119,11 @@ #ifdef __APPLE__ -extern void *sebsd_malloc (size_t size, int flags); +extern void *sebsd_ss_malloc (size_t size, int flags); +extern void sebsd_ss_free (void *); -#define malloc(size,type,flags) sebsd_malloc (size,flags) -#define free(addr,type) +#define malloc(size,type,flags) sebsd_ss_malloc (size,flags) +#define free(addr,type) sebsd_ss_free (addr) #define M_SEBSD M_MACTEMP #else @@ -132,10 +133,10 @@ #endif #endif /* __APPLE__ */ -#define kmalloc(size,flags) sebsd_malloc(size, flags) -#define kfree(v) /*free(v, M_SEBSD)*/ +#define kmalloc(size,flags) sebsd_ss_malloc(size, flags) +#define kfree(v) sebsd_ss_free(v) /* XXX need page size */ -#define __get_free_page(flags) sebsd_malloc(4096, flags) +#define __get_free_page(flags) sebsd_ss_malloc(4096, flags) #define GFP_ATOMIC M_NOWAIT #define GFP_KERNEL M_NOWAIT ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/sebsd.c#9 (text+ko) ==== @@ -97,6 +97,19 @@ kmem_free (kernel_map, v, size); } +void *sebsd_ss_malloc (size_t size, int flags) +{ + size_t *v = sebsd_malloc (size + sizeof (size_t), flags); + v[0] = size; + return v+1; +} + +void sebsd_ss_free (void *v) +{ + size_t *vs = (size_t *) v; + sebsd_free (vs-1, vs[-1]); +} + #else MALLOC_DEFINE(M_SEBSD, "sebsd", "Security Enhanced BSD"); #endif ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/security.h#3 (text+ko) ==== @@ -67,7 +67,7 @@ int security_genfs_sid(const char *fstype, char *name, security_class_t sclass, security_id_t *sid); -#define security_free_context(ctx) /*({ if (ctx) free(ctx, M_SEBSD); })*/ +#define security_free_context(ctx) ({ if (ctx) sebsd_ss_free(ctx); }) #endif /* _SELINUX_SECURITY_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Nov 7 21:34:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1539F16A4D0; Fri, 7 Nov 2003 21:34:48 -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 E0D8216A4CE for ; Fri, 7 Nov 2003 21:34:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59D014400B for ; Fri, 7 Nov 2003 21:34:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA85YkXJ025555 for ; Fri, 7 Nov 2003 21:34:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA85YjjY025552 for perforce@freebsd.org; Fri, 7 Nov 2003 21:34:45 -0800 (PST) (envelope-from jhb@freebsd.org) Message-Id: <200311080534.hA85YjjY025552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 41720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sat, 08 Nov 2003 05:34:48 -0000 X-Original-Date: Fri, 7 Nov 2003 21:34:45 -0800 (PST) X-List-Received-Date: Sat, 08 Nov 2003 05:34:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=41720 Change 41720 by jhb@jhb_laptop on 2003/11/07 21:34:27 IFC @41717. Affected files ... .. //depot/projects/smpng/sys/alpha/include/bus.h#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/smpng/sys/amd64/conf/gethints.awk#2 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#1 branch .. //depot/projects/smpng/sys/amd64/include/frame.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/ieeefp.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/npx.h#4 delete .. //depot/projects/smpng/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/reg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/signal.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/ucontext.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/amd64/isa/npx.c#3 delete .. //depot/projects/smpng/sys/amd64/isa/vector.S#2 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/smpng/sys/conf/files.amd64#9 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#36 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#52 integrate .. //depot/projects/smpng/sys/i386/include/bus_dma.h#10 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#18 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#14 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#16 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/krpc_subr.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#14 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#21 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/user/jhb/acpipci/notes#58 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/bus.h#14 (text+ko) ==== @@ -67,7 +67,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/alpha/include/bus.h,v 1.24 2003/09/23 08:22:33 nyan Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.25 2003/11/07 23:29:42 scottl Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -569,6 +569,10 @@ * nsegments: Number of discontinuities allowed in maps. * maxsegsz: Maximum size of a segment in the map. * flags: Bus DMA flags. + * lockfunc: An optional function to handle driver-defined lock + * operations. + * lockfuncarg: An argument that will be passed to lockfunc in addition + * to the lock operation. * dmat: A pointer to set to a valid dma tag should the return * value of this function indicate success. */ ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -33,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.141 2003/05/15 00:23:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.143 2003/11/08 04:39:21 peter Exp $ */ #include @@ -131,7 +132,7 @@ pushq %rsi addq $PCB_SAVEFPU,%r8 /* h/w bugs make saving complicated */ movq %r8, %rdi - call npxsave /* do it in a big C function */ + call fpusave /* do it in a big C function */ popq %rsi popq %rdi 1: @@ -301,16 +302,16 @@ popq PCB_RFLAGS(%rcx) /* - * If fpcurthread == NULL, then the npx h/w state is irrelevant and the + * If fpcurthread == NULL, then the fpu h/w state is irrelevant and the * state had better already be in the pcb. This is true for forks * but not for dumps (the old book-keeping with FP flags in the pcb * always lost for dumps because the dump pcb has 0 flags). * - * If fpcurthread != NULL, then we have to save the npx h/w state to + * If fpcurthread != NULL, then we have to save the fpu h/w state to * fpcurthread's pcb and copy it to the requested pcb, or save to the * requested pcb and reload. Copying is easier because we would * have to handle h/w bugs for reloading. We used to lose the - * parent's npx state for forks by forgetting to reload. + * parent's fpu state for forks by forgetting to reload. */ pushfq cli @@ -322,7 +323,7 @@ pushq %rax movq TD_PCB(%rax),%rdi leaq PCB_SAVEFPU(%rdi),%rdi - call npxsave + call fpusave popq %rax popq %rcx ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * All rights reserved. @@ -38,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.594 2003/10/18 22:25:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.596 2003/11/08 04:37:54 peter Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -516,7 +517,6 @@ bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; - /* This strangeness is to ensure alignment after the implied return address */ regs->tf_rsp = ((stack - 8) & ~0xF) + 8; regs->tf_rdi = stack; /* argv */ regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T); @@ -524,20 +524,20 @@ regs->tf_cs = _ucodesel; /* - * Arrange to trap the next npx or `fwait' instruction (see npx.c - * for why fwait must be trapped at least if there is an npx or an + * Arrange to trap the next fpu or `fwait' instruction (see fpu.c + * for why fwait must be trapped at least if there is an fpu or an * emulator). This is mainly to handle the case where npx0 is not - * configured, since the npx routines normally set up the trap + * configured, since the fpu routines normally set up the trap * otherwise. It should be done only at boot time, but doing it - * here allows modifying `npx_exists' for testing the emulator on - * systems with an npx. + * here allows modifying `fpu_exists' for testing the emulator on + * systems with an fpu. */ load_cr0(rcr0() | CR0_MP | CR0_TS); - /* Initialize the npx (if any) for the current process. */ + /* Initialize the fpu (if any) for the current process. */ /* * XXX the above load_cr0() also initializes it and is a layering - * violation if NPX is configured. It drops the npx partially + * violation. It drops the fpu state partially * and this would be fatal if we were interrupted now, and decided * to force the state to the pcb, and checked the invariant * (CR0_TS clear) if and only if PCPU_GET(fpcurthread) != NULL). @@ -555,7 +555,7 @@ register_t cr0; cr0 = rcr0(); - cr0 |= CR0_NE; /* Done by npxinit() */ + cr0 |= CR0_NE; /* Done by fpuinit() */ cr0 |= CR0_MP | CR0_TS; /* Done at every execve() too. */ cr0 |= CR0_WP | CR0_AM; load_cr0(cr0); @@ -1255,6 +1255,7 @@ pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); msgbufinit(msgbufp, MSGBUF_SIZE); + fpuinit(); /* transfer to user mode */ @@ -1525,8 +1526,8 @@ get_fpcontext(struct thread *td, mcontext_t *mcp) { - mcp->mc_ownedfp = npxgetregs(td, (struct savefpu *)&mcp->mc_fpstate); - mcp->mc_fpformat = npxformat(); + mcp->mc_ownedfp = fpugetregs(td, (struct savefpu *)&mcp->mc_fpstate); + mcp->mc_fpformat = fpuformat(); } static int @@ -1543,11 +1544,11 @@ else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { /* - * XXX we violate the dubious requirement that npxsetregs() + * XXX we violate the dubious requirement that fpusetregs() * be called with interrupts disabled. * XXX obsolete on trap-16 systems? */ - npxsetregs(td, (struct savefpu *)&mcp->mc_fpstate); + fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate); } else return (EINVAL); return (0); @@ -1560,18 +1561,18 @@ s = intr_disable(); if (PCPU_GET(fpcurthread) == td) - npxdrop(); + fpudrop(); /* - * XXX force a full drop of the npx. The above only drops it if we + * XXX force a full drop of the fpu. The above only drops it if we * owned it. * - * XXX I don't much like npxgetregs()'s semantics of doing a full + * XXX I don't much like fpugetregs()'s semantics of doing a full * drop. Dropping only to the pcb matches fnsave's behaviour. * We only need to drop to !PCB_INITDONE in sendsig(). But - * sendsig() is the only caller of npxgetregs()... perhaps we just + * sendsig() is the only caller of fpugetregs()... perhaps we just * have too many layers. */ - curthread->td_pcb->pcb_flags &= ~PCB_NPXINITDONE; + curthread->td_pcb->pcb_flags &= ~PCB_FPUINITDONE; intr_restore(s); } ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.54 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.55 2003/11/08 03:33:37 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -268,7 +268,6 @@ /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. - * (Exceptions include npx.) */ static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -5,6 +5,8 @@ * All rights reserved. * Copyright (c) 1994 David Greenman * All rights reserved. + * Copyright (c) 2003 Peter Wemm + * All rights reserved. * * This code is derived from software contributed to Berkeley by * the Systems Programming Group of the University of Utah Computer @@ -73,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.444 2003/10/30 04:08:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.445 2003/11/08 04:39:21 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/smpng/sys/amd64/amd64/support.S#6 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1993 The Regents of the University of California. * All rights reserved. * @@ -30,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.102 2003/10/02 05:08:13 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.103 2003/11/08 04:39:21 peter Exp $ */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -34,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.85 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.86 2003/11/08 04:39:21 peter Exp $"); #include #include ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.268 2003/10/30 04:06:28 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.269 2003/11/08 03:33:37 peter Exp $"); /* * AMD64 Trap and System call handling @@ -244,7 +244,7 @@ break; case T_ARITHTRAP: /* arithmetic trap */ - ucode = npxtrap(); + ucode = fputrap(); if (ucode == -1) goto userout; i = SIGFPE; @@ -310,7 +310,7 @@ case T_DNA: /* transparent fault (due to context switch "late") */ - if (npxdna()) + if (fpudna()) goto userout; i = SIGFPE; ucode = FPE_FPU_NP_TRAP; @@ -338,12 +338,12 @@ case T_DNA: /* - * The kernel is apparently using npx for copying. + * The kernel is apparently using fpu for copying. * XXX this should be fatal unless the kernel has * registered such use. */ - if (npxdna()) { - printf("npxdna in kernel mode!\n"); + if (fpudna()) { + printf("fpudna in kernel mode!\n"); goto out; } break; ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.218 2003/10/30 19:04:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.220 2003/11/08 03:33:37 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -118,7 +118,7 @@ /* Ensure that p1's pcb is up to date. */ savecrit = intr_disable(); if (PCPU_GET(fpcurthread) == td1) - npxsave(&td1->td_pcb->pcb_save); + fpusave(&td1->td_pcb->pcb_save); intr_restore(savecrit); /* Point the pcb to the top of the stack */ @@ -206,7 +206,7 @@ { if (td == PCPU_GET(fpcurthread)) - npxdrop(); + fpudrop(); } void @@ -266,7 +266,7 @@ * more analysis) (need a good safe default). */ bcopy(td0->td_pcb, pcb2, sizeof(*pcb2)); - pcb2->pcb_flags &= ~(PCB_NPXTRAP|PCB_NPXINITDONE); + pcb2->pcb_flags &= ~PCB_FPUINITDONE; /* * Create a new fresh stack for the new thread. ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.396 2003/09/19 20:04:55 joerg Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.397 2003/11/08 03:17:36 peter Exp $ machine amd64 cpu HAMMER @@ -64,11 +64,13 @@ options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +device acpi device isa device pci -device acpi -options ACPI_DEBUG + +# Sound (no modules) +device pcm # Floppy drives device fdc @@ -100,15 +102,9 @@ device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters -# RAID controllers interfaced to the SCSI subsystem -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options! -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals -device scbus # SCSI bus (required) +device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc) @@ -116,13 +112,19 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID +device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV - See NOTES for options +device iir # Intel Integrated RAID +device ips # IBM (Adaptec) ServeRAID +device mly # Mylex AcceleRAID/eXtremeRAID + # RAID controllers -#XXX pointer/int warnings device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) -device amr # AMI MegaRAID device ida # Compaq Smart RAID -device ips # IBM (Adaptec) ServeRAID device mlx # Mylex DAC960 family #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 @@ -172,6 +174,7 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bfe # Broadcom BCM440x 10/100 ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -253,5 +256,3 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) - -device pcm # Sound ==== //depot/projects/smpng/sys/amd64/conf/gethints.awk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # 'hints' directive. See how GENERIC and GENERIC.hints fit together for # a static example. You should use loader(8) if at all possible. # -# $FreeBSD: src/sys/amd64/conf/gethints.awk,v 1.2 2002/07/26 03:52:30 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/gethints.awk,v 1.3 2003/11/08 03:33:38 peter Exp $ # skip commented lines, empty lines and not "device" lines /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; } @@ -91,7 +91,6 @@ sub ("IO_LPT3", "0x3BC", val); sub ("IO_MDA", "0x3B0", val); sub ("IO_NMI", "0x070", val); - sub ("IO_NPX", "0x0F0", val); sub ("IO_PMP1", "0x026", val); sub ("IO_PMP2", "0x178", val); sub ("IO_PPI", "0x061", val); ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.4 2003/08/23 00:04:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.5 2003/11/08 03:33:38 peter Exp $"); #include "opt_compat.h" @@ -108,7 +108,7 @@ * * XXX unpessimize most cases by only aligning when fxsave might be * called, although this requires knowing too much about - * npxgetregs()'s internals. + * fpugetregs()'s internals. */ addr = (struct savefpu *)&mcp->mc_fpstate; if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { @@ -116,12 +116,12 @@ addr = (void *)((char *)addr + 4); while ((uintptr_t)(void *)addr & 0xF); } - mcp->mc_ownedfp = npxgetregs(td, addr); + mcp->mc_ownedfp = fpugetregs(td, addr); if (addr != (struct savefpu *)&mcp->mc_fpstate) { bcopy(addr, &mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); } - mcp->mc_fpformat = npxformat(); + mcp->mc_fpformat = fpuformat(); } static int @@ -148,10 +148,10 @@ bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); } /* - * XXX we violate the dubious requirement that npxsetregs() + * XXX we violate the dubious requirement that fpusetregs() * be called with interrupts disabled. */ - npxsetregs(td, addr); + fpusetregs(td, addr); /* * Don't bother putting things back where they were in the * misaligned case, since we know that the caller won't use ==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#7 (text+ko) ==== @@ -67,7 +67,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/amd64/include/bus_dma.h,v 1.24 2003/07/27 13:52:08 mux Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.25 2003/11/07 23:29:42 scottl Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ @@ -160,6 +160,10 @@ * nsegments: Number of discontinuities allowed in maps. * maxsegsz: Maximum size of a segment in the map. * flags: Bus DMA flags. + * lockfunc: An optional function to handle driver-defined lock + * operations. + * lockfuncarg: An argument that will be passed to lockfunc in addition + * to the lock operation. * dmat: A pointer to set to a valid dma tag should the return * value of this function indicate success. */ ==== //depot/projects/smpng/sys/amd64/include/cpufunc.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1993 The Regents of the University of California. * All rights reserved. * @@ -30,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.136 2003/05/15 00:23:40 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.137 2003/11/08 04:39:22 peter Exp $ */ /* ==== //depot/projects/smpng/sys/amd64/include/frame.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -34,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/frame.h,v 1.25 2003/10/15 02:04:52 peter Exp $ + * $FreeBSD: src/sys/amd64/include/frame.h,v 1.26 2003/11/08 04:39:22 peter Exp $ */ #ifndef _MACHINE_FRAME_H_ ==== //depot/projects/smpng/sys/amd64/include/ieeefp.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 Andrew Moore, Talke Studio * All rights reserved. * @@ -31,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.10 2003/08/02 00:26:30 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.11 2003/11/08 04:39:22 peter Exp $ */ /* ==== //depot/projects/smpng/sys/amd64/include/pcb.h#5 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -34,16 +35,16 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.53 2003/05/15 00:23:40 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.56 2003/11/08 04:39:22 peter Exp $ */ -#ifndef _I386_PCB_H_ -#define _I386_PCB_H_ +#ifndef _AMD64_PCB_H_ +#define _AMD64_PCB_H_ /* - * Intel 386 process control block + * AMD64 process control block */ -#include +#include struct pcb { register_t padxx[8]; @@ -66,9 +67,8 @@ struct savefpu pcb_save; u_long pcb_flags; -#define PCB_NPXTRAP 0x01 /* npx trap pending */ -#define PCB_NPXINITDONE 0x02 /* fpu state is initialized */ -#define PCB_FULLCTX 0x04 /* full context restore on sysret */ +#define PCB_FPUINITDONE 0x01 /* fpu state is initialized */ +#define PCB_FULLCTX 0x02 /* full context restore on sysret */ caddr_t pcb_onfault; /* copyin/out fault recovery */ }; @@ -77,4 +77,4 @@ void savectx(struct pcb *); #endif -#endif /* _I386_PCB_H_ */ +#endif /* _AMD64_PCB_H_ */ ==== //depot/projects/smpng/sys/amd64/include/pmap.h#7 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * @@ -42,7 +43,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.107 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.108 2003/11/08 04:39:22 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/smpng/sys/amd64/include/reg.h#3 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -34,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/reg.h,v 1.31 2003/05/23 06:31:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.33 2003/11/08 04:39:22 peter Exp $ */ #ifndef _MACHINE_REG_H_ @@ -73,7 +74,7 @@ */ struct fpreg { /* - * XXX should get struct from npx.h. Here we give a slightly + * XXX should get struct from fpu.h. Here we give a slightly * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ ==== //depot/projects/smpng/sys/amd64/include/signal.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1986, 1989, 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -31,7 +32,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/signal.h,v 1.24 2003/10/15 02:04:52 peter Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.26 2003/11/08 04:39:22 peter Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -100,7 +101,7 @@ long sc_ss; long sc_len; /* sizeof(mcontext_t) */ /* - * XXX - See and for + * XXX - See and for * the following fields. */ long sc_fpformat; ==== //depot/projects/smpng/sys/amd64/include/specialreg.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.25 2003/09/22 22:51:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.26 2003/11/08 03:33:38 peter Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -41,12 +41,9 @@ * Bits in 386 special registers: */ #define CR0_PE 0x00000001 /* Protected mode Enable */ -#define CR0_MP 0x00000002 /* "Math" Present (NPX or NPX emulator) */ -#define CR0_EM 0x00000004 /* EMulate non-NPX coproc. (trap ESC only) */ +#define CR0_MP 0x00000002 /* "Math" (fpu) Present */ +#define CR0_EM 0x00000004 /* EMulate FPU instructions. (trap ESC only) */ #define CR0_TS 0x00000008 /* Task Switched (if MP, trap ESC and WAIT) */ -#ifdef notused -#define CR0_ET 0x00000010 /* Extension Type (387 (if set) vs 287) */ -#endif #define CR0_PG 0x80000000 /* PaGing enable */ /* ==== //depot/projects/smpng/sys/amd64/include/ucontext.h#5 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm * Copyright (c) 1999 Marcel Moolenaar * All rights reserved. * @@ -25,7 +26,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/amd64/include/ucontext.h,v 1.16 2003/10/15 02:04:52 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.18 2003/11/08 04:39:22 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -72,7 +73,7 @@ #define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */ long mc_ownedfp; /* - * See for the internals of mc_fpstate[]. + * See for the internals of mc_fpstate[]. */ long mc_fpstate[64] __aligned(16); long mc_spare[8]; ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#5 (text+ko) ==== @@ -3,6 +3,8 @@ * All rights reserved. * Copyright (c) 1994 John S. Dyson * All rights reserved. + * Copyright (c) 2003 Peter Wemm + * All rights reserved. * * This code is derived from software contributed to Berkeley by * William Jolitz. @@ -36,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.42 2003/09/25 01:11:17 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.43 2003/11/08 04:39:22 peter Exp $ */ ==== //depot/projects/smpng/sys/amd64/isa/vector.S#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/vector.S,v 1.39 2003/05/03 00:21:43 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/vector.S,v 1.40 2003/11/08 03:33:38 peter Exp $ */ #include @@ -33,7 +33,7 @@ * * XXX - the interrupt frame is set up to look like a trap frame. This is * usually a waste of time. The only interrupt handlers that want a frame - * are the clock handler (it wants a clock frame), the npx handler (it's + * are the clock handler (it wants a clock frame), the fpu handler (it's * easier to do right all in assembler). The interrupt return routine * needs a trap frame for rare AST's (it could easily convert the frame). * The direct costs of setting up a trap frame are two pushl's (error @@ -42,7 +42,7 @@ * costs are making the driver interface nonuniform so unpending of * interrupts is more complicated and slower (call_driver(unit) would * be easier than ensuring an interrupt frame for all handlers. Finally, - * there are some struct copies in the npx handler and maybe in the clock + * there are some struct copies in the fpu handler and maybe in the clock * handler that could be avoided by working more with pointers to frames * instead of frames. * ==== //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#3 (text+ko) ==== @@ -26,7 +26,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/ia32/ia32_signal.h,v 1.2 2003/10/30 02:40:30 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.3 2003/11/08 02:36:05 peter Exp $ */ struct ia32_sigaltstack { @@ -62,7 +62,7 @@ int mc_ownedfp; int mc_spare1[1]; /* align next field to 16 bytes */ /* - * See for the internals of mc_fpstate[]. + * See for the internals of mc_fpstate[]. */ int mc_fpstate[128] __aligned(16); int mc_spare2[8]; ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.10 2003/10/30 02:43:19 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.11 2003/11/08 03:35:06 peter Exp $"); #include "opt_compat.h" @@ -279,18 +279,7 @@ regs->tf_ss = _udatasel; regs->tf_cs = _ucode32sel; regs->tf_rbx = ps_strings; - - /* - * Arrange to trap the next npx or `fwait' instruction (see npx.c - * for why fwait must be trapped at least if there is an npx or an - * emulator). This is mainly to handle the case where npx0 is not - * configured, since the npx routines normally set up the trap - * otherwise. It should be done only at boot time, but doing it - * here allows modifying `npx_exists' for testing the emulator on - * systems with an npx. - */ load_cr0(rcr0() | CR0_MP | CR0_TS); - fpstate_drop(td); /* Return via doreti so that we can change to a different %cs */ ==== //depot/projects/smpng/sys/conf/files.amd64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.24 2003/10/14 05:51:31 alc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.25 2003/11/08 02:40:40 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -76,13 +76,13 @@ amd64/amd64/uma_machdep.c standard amd64/amd64/vm_machdep.c standard amd64/amd64/in_cksum.c optional inet +amd64/amd64/fpu.c standard amd64/isa/clock.c standard amd64/isa/intr_machdep.c standard amd64/isa/isa.c standard amd64/isa/isa_dma.c standard amd64/isa/ithread.c standard -amd64/isa/npx.c standard amd64/pci/pci_cfgreg.c optional pci amd64/pci/pci_bus.c optional pci ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#36 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.96 2003/10/24 07:20:13 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.98 2003/11/08 03:28:43 imp Exp $ */ /* @@ -415,15 +415,22 @@ * interrupts. These interrupts aren't really generated by the chip, since * IRQ1 is reserved. Some chipsets assert INTA# inappropriately during * initialization, so this helps to work around the problem. + * + * XXX We can't do this workaround for all chipsets, because this + * XXX causes interference with the keyboard because somechipsets will + * XXX actually signal IRQ1 over their serial interrupt connections to + * XXX the south bridge. Disable it it for now. */ static void cbb_disable_func_intr(struct cbb_softc *sc) { +#if 0 uint8_t reg; reg = (exca_getb(&sc->exca, EXCA_INTR) & ~EXCA_INTR_IRQ_MASK) | EXCA_INTR_IRQ_RESERVED1; exca_putb(&sc->exca, EXCA_INTR, reg); +#endif } /* ==== //depot/projects/smpng/sys/i386/i386/db_interface.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.76 2003/11/03 22:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.77 2003/11/08 03:01:26 alc Exp $"); /* * Interface to new debugger. @@ -263,7 +263,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 11 19:33:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE73916A4D0; Tue, 11 Nov 2003 19:33:30 -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 BA60B16A4CE for ; Tue, 11 Nov 2003 19:33:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FBD743FB1 for ; Tue, 11 Nov 2003 19:33:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAC3XUXJ032644 for ; Tue, 11 Nov 2003 19:33:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC3XT1K032641 for perforce@freebsd.org; Tue, 11 Nov 2003 19:33:29 -0800 (PST) (envelope-from peter@freebsd.org) Message-Id: <200311120333.hAC3XT1K032641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 12 Nov 2003 03:33:31 -0000 X-Original-Date: Tue, 11 Nov 2003 19:33:29 -0800 (PST) X-List-Received-Date: Wed, 12 Nov 2003 03:33:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=42085 Change 42085 by peter@peter_overcee on 2003/11/11 19:32:45 sanity check for the outb shootdown for the atpic Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#65 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#65 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_ddb.h" #include "opt_inet.h" #include "opt_ipx.h" +#include "opt_isa.h" #include "opt_kstack_pages.h" #include "opt_maxmem.h" #include "opt_msgbuf.h" @@ -1122,9 +1123,13 @@ u_int64_t msr; char *env; +#ifdef DEV_ISA /* Preemptively mask the atpics and leave them shut down */ outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); +#else +#error "have you forgotten the isa device?"; +#endif /* Turn on PTE NX (no execute) bit */ msr = rdmsr(MSR_EFER) | EFER_NXE; From owner-p4-projects@FreeBSD.ORG Wed Nov 12 16:34:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EADD16A4D0; Wed, 12 Nov 2003 16:34:36 -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 D369116A4CE for ; Wed, 12 Nov 2003 16:34:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EF4A43F93 for ; Wed, 12 Nov 2003 16:34:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAD0YXXJ035177 for ; Wed, 12 Nov 2003 16:34:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAD0YWIJ035174 for perforce@freebsd.org; Wed, 12 Nov 2003 16:34:32 -0800 (PST) (envelope-from peter@freebsd.org) Message-Id: <200311130034.hAD0YWIJ035174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Thu, 13 Nov 2003 00:34:36 -0000 X-Original-Date: Wed, 12 Nov 2003 16:34:32 -0800 (PST) X-List-Received-Date: Thu, 13 Nov 2003 00:34:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=42194 Change 42194 by peter@peter_daintree on 2003/11/12 16:34:07 IFC @42193 Affected files ... .. //depot/projects/hammer/Makefile.inc1#32 integrate .. //depot/projects/hammer/UPDATING#25 integrate .. //depot/projects/hammer/bin/df/df.c#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#5 integrate .. //depot/projects/hammer/lib/Makefile#28 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#13 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.8#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#6 integrate .. //depot/projects/hammer/lib/libutil/Makefile#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#20 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/hammer/sys/i386/isa/icu.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#13 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#4 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#6 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.395 2003/11/10 09:00:08 harti Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.396 2003/11/12 17:09:12 harti Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -818,8 +818,8 @@ _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libpam lib/libradius \ - lib/librpcsvc \ + lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ + lib/libradius lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun ==== //depot/projects/hammer/UPDATING#25 (text+ko) ==== @@ -18,15 +18,25 @@ to maximize performance. 20031112: - Some netgraph string length constants have been changed. This - change requires the netgraph kernel modules and all netgraph - userland components to be in sync. Especially users who require - netgraph to boot need to make sure to have world and kernel in - sync before rebooting. + The statfs structure has been updated with 64-bit fields to allow + accurate reporting of multi-terabyte filesystem sizes. You should + build and boot a new kernel BEFORE doing a `make world' as the new + kernel will know about binaries using the old statfs structure, + but an old kernel will not know about the new system calls that + support the new statfs structure. Running an old kernel after a + `make world' will cause programs such as `df' that do a statfs + system call to fail with a bad system call. + +20031112: + Some netgraph string length constants have been changed. This + change requires the netgraph kernel modules and all netgraph + userland components to be in sync. Especially users who require + netgraph to boot need to make sure to have world and kernel in + sync before rebooting. 20031103: The i386 APIC_IO kernel option has been replaced by - 'device apic'. The ACPI module has also been temporarily + 'device apic'. The ACPI module has also been temporarily disabled, so ACPI must be statically compiled into your kernel using 'device acpi' if you wish to use the ACPI driver. @@ -1405,4 +1415,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.277 2003/11/12 09:11:18 harti Exp $ +$FreeBSD: src/UPDATING,v 1.278 2003/11/12 19:13:02 mckusick Exp $ ==== //depot/projects/hammer/bin/df/df.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.52 2003/11/12 08:01:39 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.53 2003/11/12 21:47:42 kris Exp $"); #include #include @@ -445,7 +445,7 @@ if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*qd %*qd %*qd", + (void)printf(" %*jd %*jd %*jd", (u_int)mwp->total, (intmax_t)fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), (u_int)mwp->used, @@ -458,7 +458,7 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*qd %*qd %4.0f%% ", + (void)printf(" %*jd %*jd %4.0f%% ", (u_int)mwp->iused, (intmax_t)used, (u_int)mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#14 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.119 2003/10/20 21:22:41 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.120 2003/11/12 20:08:47 phk Exp $ % -- Gifts for Children -- @@ -5687,6 +5687,17 @@ achieve "super shuttle diplomacy" between cool data, perhaps earned by HOST COMPUTER, and warm heart of human being. % +From the Pointless Comparison Collection: + + To give you an idea of how sensitive these antennas are, + if we were to "listen" to one spacecraft in the outer solar + system by Jupiter or Saturn for 1 billion years and add up + all the signal we collected, it would be enough power to + set off the flash bulb on your camera once. + + -- Peter Doms, manager of the Deep Space Network + systems program at JPL. +% From the Pro 350 Pocket Service Guide, p. 49, Step 5 of the instructions on removing an I/O board from the card cage, comes a new experience in sound: ==== //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#5 (text+ko) ==== @@ -20,7 +20,7 @@ # along with GNU GNATS; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # -# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.34 2003/11/02 17:35:33 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.35 2003/11/12 23:08:23 ceri Exp $ # The version of this send-pr. VERSION=3.113 @@ -262,7 +262,7 @@ # Catch some signals. ($xs kludge needed by Sun /bin/sh) xs=0 trap 'rm -f $REF $TEMP; exit $xs' 0 -trap 'echo "$COMMAND: Aborting ..."; rm -f $REF $TEMP; xs=1; exit' 1 2 3 13 15 +trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15 # If they told us to use a specific file, then do so. if [ -n "$IN_FILE" ]; then ==== //depot/projects/hammer/lib/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.175 2003/11/10 09:18:04 harti Exp $ +# $FreeBSD: src/lib/Makefile,v 1.176 2003/11/12 17:09:13 harti Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -11,6 +11,7 @@ # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # libncurses must be built before libdialog, libedit and libreadline. +# libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. @@ -21,14 +22,14 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \ - libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \ +SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ + libnetgraph libradius librpcsvc libsbuf libtacplus libutil libypclnt \ ${_compat} libalias ${_libatm} ${_libbind} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ - libnetgraph ${_libngatm} libopie libpam libpanel libpcap \ + ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ==== //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/Makefile,v 1.2 2003/11/10 13:43:26 harti Exp $ +# $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/Makefile,v 1.3 2003/11/12 17:09:13 harti Exp $ # # Author: Harti Brandt @@ -12,6 +12,9 @@ DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h +DPADD= ${LIBNETGRAPH} +LDADD= -lnetgraph + CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include ==== //depot/projects/hammer/lib/libdisk/create_chunk.c#13 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.82 2003/11/02 08:39:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.83 2003/11/12 17:44:37 marcel Exp $"); #include #include @@ -159,8 +159,12 @@ max = NDOSPART; #endif for (j = 1; j <= max; j++) { +#ifdef __ia64__ sprintf(c2->oname, "%s%c%d", c1->name, (c1->type == whole) ? 'p' : 's', j); +#else + sprintf(c2->oname, "%ss%d", c1->name, j); +#endif for (c3 = c1->part; c3; c3 = c3->next) if (c3 != c2 && !strcmp(c3->name, c2->oname)) goto match; ==== //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.8#4 (text+ko) ==== @@ -36,7 +36,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.13 2002/11/29 15:57:50 ru Exp $ +.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.14 2003/11/12 17:47:23 sobomax Exp $ .\" .Dd October 28, 2002 .Dt PAM_RADIUS 8 @@ -100,6 +100,10 @@ in the system databases equal to the supplied one (as determined by call to .Xr getpwnam 3 ) , the authentication will fail. +.It Cm nas_ipaddr Ns Op No = Ns Ar address +specifies a NAS IP address to be sent. +If option is present, but there is no value provided then IP address +corresponding to the current hostname will be used. .El .Sh FILES .Bl -tag -width /etc/radius.conf -compact ==== //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#6 (text+ko) ==== @@ -35,9 +35,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.17 2003/07/21 19:56:28 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.19 2003/11/12 23:36:17 sobomax Exp $"); #include +#include +#include +#include #include #include #include @@ -54,12 +57,14 @@ #define PAM_OPT_CONF "conf" #define PAM_OPT_TEMPLATE_USER "template_user" #define PAM_OPT_NAS_ID "nas_id" +#define PAM_OPT_NAS_IPADDR "nas_ipaddr" #define MAX_CHALLENGE_MSGS 10 #define PASSWORD_PROMPT "RADIUS Password:" static int build_access_request(struct rad_handle *, const char *, - const char *, const char *, const void *, size_t); + const char *, const char *, const char *, const void *, + size_t); static int do_accept(pam_handle_t *, struct rad_handle *); static int do_challenge(pam_handle_t *, struct rad_handle *, const char *); @@ -70,16 +75,28 @@ */ static int build_access_request(struct rad_handle *radh, const char *user, - const char *pass, const char *nas_id, const void *state, size_t state_len) + const char *pass, const char *nas_id, const char *nas_ipaddr, + const void *state, size_t state_len) { - char host[MAXHOSTNAMELEN]; + int error; + char host[MAXHOSTNAMELEN]; + struct sockaddr_in *haddr; + struct addrinfo hints; + struct addrinfo *res; if (rad_create_request(radh, RAD_ACCESS_REQUEST) == -1) { syslog(LOG_CRIT, "rad_create_request: %s", rad_strerror(radh)); return (-1); } - if (nas_id == NULL && gethostname(host, sizeof host) != -1) - nas_id = host; + if (nas_id == NULL || + (nas_ipaddr != NULL && strlen(nas_ipaddr) == 0)) { + if (gethostname(host, sizeof host) != -1) { + if (nas_id == NULL) + nas_id = host; + if (nas_ipaddr != NULL && strlen(nas_ipaddr) == 0) + nas_ipaddr = host; + } + } if ((user != NULL && rad_put_string(radh, RAD_USER_NAME, user) == -1) || (pass != NULL && @@ -89,6 +106,22 @@ syslog(LOG_CRIT, "rad_put_string: %s", rad_strerror(radh)); return (-1); } + if (nas_ipaddr != NULL) { + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_INET; + if (getaddrinfo(nas_ipaddr, NULL, &hints, &res) == 0 && + res != NULL) { + (struct sockaddr *)haddr = res->ai_addr; + error = rad_put_addr(radh, RAD_NAS_IP_ADDRESS, + haddr->sin_addr); + freeaddrinfo(res); + if (error == -1) { + syslog(LOG_CRIT, "rad_put_addr: %s", + rad_strerror(radh)); + return (-1); + } + } + } if (state != NULL && rad_put_attr(radh, RAD_STATE, state, state_len) == -1) { syslog(LOG_CRIT, "rad_put_attr: %s", rad_strerror(radh)); @@ -197,7 +230,7 @@ conv->appdata_ptr)) != PAM_SUCCESS) return (retval); if (build_access_request(radh, user, resp[num_msgs-1].resp, NULL, - state, statelen) == -1) + NULL, state, statelen) == -1) return (PAM_SERVICE_ERR); memset(resp[num_msgs-1].resp, 0, strlen(resp[num_msgs-1].resp)); free(resp[num_msgs-1].resp); @@ -213,13 +246,14 @@ { struct rad_handle *radh; const char *user, *tmpuser, *pass; - const char *conf_file, *template_user, *nas_id; + const char *conf_file, *template_user, *nas_id, *nas_ipaddr; int retval; int e; conf_file = openpam_get_option(pamh, PAM_OPT_CONF); template_user = openpam_get_option(pamh, PAM_OPT_TEMPLATE_USER); nas_id = openpam_get_option(pamh, PAM_OPT_NAS_ID); + nas_ipaddr = openpam_get_option(pamh, PAM_OPT_NAS_IPADDR); retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) @@ -249,7 +283,8 @@ PAM_LOG("Radius config file read"); - if (build_access_request(radh, user, pass, nas_id, NULL, 0) == -1) { + if (build_access_request(radh, user, pass, nas_id, nas_ipaddr, NULL, + 0) == -1) { rad_close(radh); return (PAM_SERVICE_ERR); } ==== //depot/projects/hammer/lib/libutil/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libutil/Makefile,v 1.52 2003/10/18 09:58:39 markm Exp $ +# $FreeBSD: src/lib/libutil/Makefile,v 1.53 2003/11/12 21:56:07 rwatson Exp $ LIB= util -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 SHLIBDIR?= /lib CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/ CFLAGS+=-DINET6 ==== //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.7 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.8 2003/11/12 19:46:17 jhb Exp $"); #include "opt_acpi.h" #include @@ -120,7 +120,7 @@ break; default: - printf("unkown,"); + printf("unknown,"); break; } @@ -134,7 +134,7 @@ break; default: - printf("unkown,"); + printf("unknown,"); break; } @@ -148,7 +148,7 @@ break; default: - printf("unkown"); + printf("unknown"); break; } ==== //depot/projects/hammer/sys/dev/drm/drm.h#5 (text+ko) ==== @@ -1,6 +1,14 @@ -/* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- - * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com +/** + * \file drm.h + * Header for the Direct Rendering Manager + * + * \author Rickard E. (Rik) Faith * + * \par Acknowledgments: + * Dec 1999, Richard Henderson , move to generic \c cmpxchg. + */ + +/* * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All rights reserved. @@ -24,15 +32,10 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * Authors: - * Rickard E. (Rik) Faith - * - * Acknowledgements: - * Dec 1999, Richard Henderson , move to generic cmpxchg. - * - * $FreeBSD: src/sys/dev/drm/drm.h,v 1.5 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm.h,v 1.6 2003/11/12 20:56:30 anholt Exp $ */ + #ifndef _DRM_H_ #define _DRM_H_ @@ -79,29 +82,42 @@ #define DRM_DEV_GID 0 #endif -#define DRM_NAME "drm" /* Name in kernel, /dev, and /proc */ -#define DRM_MIN_ORDER 5 /* At least 2^5 bytes = 32 bytes */ -#define DRM_MAX_ORDER 22 /* Up to 2^22 bytes = 4MB */ -#define DRM_RAM_PERCENT 10 /* How much system ram can we lock? */ +#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) +#ifdef __OpenBSD__ +#define DRM_MAJOR 81 +#endif +#if defined(__linux__) || defined(__NetBSD__) +#define DRM_MAJOR 226 +#endif +#define DRM_MAX_MINOR 15 +#endif +#define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ +#define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ +#define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ +#define DRM_RAM_PERCENT 10 /**< How much system ram can we lock? */ -#define _DRM_LOCK_HELD 0x80000000 /* Hardware lock is held */ -#define _DRM_LOCK_CONT 0x40000000 /* Hardware lock is contended */ +#define _DRM_LOCK_HELD 0x80000000 /**< Hardware lock is held */ +#define _DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ #define _DRM_LOCK_IS_HELD(lock) ((lock) & _DRM_LOCK_HELD) #define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT) #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT)) + typedef unsigned long drm_handle_t; typedef unsigned int drm_context_t; typedef unsigned int drm_drawable_t; typedef unsigned int drm_magic_t; -/* Warning: If you change this structure, make sure you change - * XF86DRIClipRectRec in the server as well */ -/* KW: Actually it's illegal to change either for +/** + * Cliprect. + * + * \warning: If you change this structure, make sure you change + * XF86DRIClipRectRec in the server as well + * + * \note KW: Actually it's illegal to change either for * backwards-compatibility reasons. */ - typedef struct drm_clip_rect { unsigned short x1; unsigned short y1; @@ -109,6 +125,10 @@ unsigned short y2; } drm_clip_rect_t; + +/** + * Texture region, + */ typedef struct drm_tex_region { unsigned char next; unsigned char prev; @@ -117,32 +137,52 @@ unsigned int age; } drm_tex_region_t; + +/** + * DRM_IOCTL_VERSION ioctl argument type. + * + * \sa drmGetVersion(). + */ typedef struct drm_version { - int version_major; /* Major version */ - int version_minor; /* Minor version */ - int version_patchlevel;/* Patch level */ - size_t name_len; /* Length of name buffer */ - char *name; /* Name of driver */ - size_t date_len; /* Length of date buffer */ - char *date; /* User-space buffer to hold date */ - size_t desc_len; /* Length of desc buffer */ - char *desc; /* User-space buffer to hold desc */ + int version_major; /**< Major version */ + int version_minor; /**< Minor version */ + int version_patchlevel;/**< Patch level */ + size_t name_len; /**< Length of name buffer */ + char *name; /**< Name of driver */ + size_t date_len; /**< Length of date buffer */ + char *date; /**< User-space buffer to hold date */ + size_t desc_len; /**< Length of desc buffer */ + char *desc; /**< User-space buffer to hold desc */ } drm_version_t; + +/** + * DRM_IOCTL_GET_UNIQUE ioctl argument type. + * + * \sa drmGetBusid() and drmSetBusId(). + */ typedef struct drm_unique { - size_t unique_len; /* Length of unique */ - char *unique; /* Unique name for driver instantiation */ + size_t unique_len; /**< Length of unique */ + char *unique; /**< Unique name for driver instantiation */ } drm_unique_t; + typedef struct drm_list { - int count; /* Length of user-space structures */ + int count; /**< Length of user-space structures */ drm_version_t *version; } drm_list_t; + typedef struct drm_block { int unused; } drm_block_t; + +/** + * DRM_IOCTL_CONTROL ioctl argument type. + * + * \sa drmCtlInstHandler() and drmCtlUninstHandler(). + */ typedef struct drm_control { enum { DRM_ADD_COMMAND, @@ -153,49 +193,70 @@ int irq; } drm_control_t; + +/** + * Type of memory to map. + */ typedef enum drm_map_type { - _DRM_FRAME_BUFFER = 0, /* WC (no caching), no core dump */ - _DRM_REGISTERS = 1, /* no caching, no core dump */ - _DRM_SHM = 2, /* shared, cached */ - _DRM_AGP = 3, /* AGP/GART */ - _DRM_SCATTER_GATHER = 4 /* Scatter/gather memory for PCI DMA */ + _DRM_FRAME_BUFFER = 0, /**< WC (no caching), no core dump */ + _DRM_REGISTERS = 1, /**< no caching, no core dump */ + _DRM_SHM = 2, /**< shared, cached */ + _DRM_AGP = 3, /**< AGP/GART */ + _DRM_SCATTER_GATHER = 4 /**< Scatter/gather memory for PCI DMA */ } drm_map_type_t; + +/** + * Memory mapping flags. + */ typedef enum drm_map_flags { - _DRM_RESTRICTED = 0x01, /* Cannot be mapped to user-virtual */ + _DRM_RESTRICTED = 0x01, /**< Cannot be mapped to user-virtual */ _DRM_READ_ONLY = 0x02, - _DRM_LOCKED = 0x04, /* shared, cached, locked */ - _DRM_KERNEL = 0x08, /* kernel requires access */ - _DRM_WRITE_COMBINING = 0x10, /* use write-combining if available */ - _DRM_CONTAINS_LOCK = 0x20, /* SHM page that contains lock */ - _DRM_REMOVABLE = 0x40 /* Removable mapping */ + _DRM_LOCKED = 0x04, /**< shared, cached, locked */ + _DRM_KERNEL = 0x08, /**< kernel requires access */ + _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */ + _DRM_CONTAINS_LOCK = 0x20, /**< SHM page that contains lock */ + _DRM_REMOVABLE = 0x40 /**< Removable mapping */ } drm_map_flags_t; + typedef struct drm_ctx_priv_map { - unsigned int ctx_id; /* Context requesting private mapping */ - void *handle; /* Handle of map */ + unsigned int ctx_id; /**< Context requesting private mapping */ + void *handle; /**< Handle of map */ } drm_ctx_priv_map_t; + +/** + * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls + * argument type. + * + * \sa drmAddMap(). + */ typedef struct drm_map { - unsigned long offset; /* Requested physical address (0 for SAREA)*/ - unsigned long size; /* Requested physical size (bytes) */ - drm_map_type_t type; /* Type of memory to map */ - drm_map_flags_t flags; /* Flags */ - void *handle; /* User-space: "Handle" to pass to mmap */ - /* Kernel-space: kernel-virtual address */ - int mtrr; /* MTRR slot used */ - /* Private data */ + unsigned long offset; /**< Requested physical address (0 for SAREA)*/ + unsigned long size; /**< Requested physical size (bytes) */ + drm_map_type_t type; /**< Type of memory to map */ + drm_map_flags_t flags; /**< Flags */ + void *handle; /**< User-space: "Handle" to pass to mmap() */ + /**< Kernel-space: kernel-virtual address */ + int mtrr; /**< MTRR slot used */ + /* Private data */ } drm_map_t; + +/** + * DRM_IOCTL_GET_CLIENT ioctl argument type. + */ typedef struct drm_client { - int idx; /* Which client desired? */ - int auth; /* Is client authenticated? */ - unsigned long pid; /* Process id */ - unsigned long uid; /* User id */ - unsigned long magic; /* Magic */ - unsigned long iocs; /* Ioctl count */ + int idx; /**< Which client desired? */ + int auth; /**< Is client authenticated? */ + unsigned long pid; /**< Process ID */ + unsigned long uid; /**< User ID */ + unsigned long magic; /**< Magic */ + unsigned long iocs; /**< Ioctl count */ } drm_client_t; + typedef enum { _DRM_STAT_LOCK, _DRM_STAT_OPENS, @@ -203,20 +264,24 @@ _DRM_STAT_IOCTLS, _DRM_STAT_LOCKS, _DRM_STAT_UNLOCKS, - _DRM_STAT_VALUE, /* Generic value */ - _DRM_STAT_BYTE, /* Generic byte counter (1024bytes/K) */ - _DRM_STAT_COUNT, /* Generic non-byte counter (1000/k) */ + _DRM_STAT_VALUE, /**< Generic value */ + _DRM_STAT_BYTE, /**< Generic byte counter (1024bytes/K) */ + _DRM_STAT_COUNT, /**< Generic non-byte counter (1000/k) */ - _DRM_STAT_IRQ, /* IRQ */ - _DRM_STAT_PRIMARY, /* Primary DMA bytes */ - _DRM_STAT_SECONDARY, /* Secondary DMA bytes */ - _DRM_STAT_DMA, /* DMA */ - _DRM_STAT_SPECIAL, /* Special DMA (e.g., priority or polled) */ - _DRM_STAT_MISSED /* Missed DMA opportunity */ + _DRM_STAT_IRQ, /**< IRQ */ + _DRM_STAT_PRIMARY, /**< Primary DMA bytes */ + _DRM_STAT_SECONDARY, /**< Secondary DMA bytes */ + _DRM_STAT_DMA, /**< DMA */ + _DRM_STAT_SPECIAL, /**< Special DMA (e.g., priority or polled) */ + _DRM_STAT_MISSED /**< Missed DMA opportunity */ /* Add to the *END* of the list */ } drm_stat_type_t; + +/** + * DRM_IOCTL_GET_STATS ioctl argument type. + */ typedef struct drm_stats { unsigned long count; struct { @@ -225,137 +290,220 @@ } data[15]; } drm_stats_t; + +/** + * Hardware locking flags. + */ typedef enum drm_lock_flags { - _DRM_LOCK_READY = 0x01, /* Wait until hardware is ready for DMA */ - _DRM_LOCK_QUIESCENT = 0x02, /* Wait until hardware quiescent */ - _DRM_LOCK_FLUSH = 0x04, /* Flush this context's DMA queue first */ - _DRM_LOCK_FLUSH_ALL = 0x08, /* Flush all DMA queues first */ + _DRM_LOCK_READY = 0x01, /**< Wait until hardware is ready for DMA */ + _DRM_LOCK_QUIESCENT = 0x02, /**< Wait until hardware quiescent */ + _DRM_LOCK_FLUSH = 0x04, /**< Flush this context's DMA queue first */ + _DRM_LOCK_FLUSH_ALL = 0x08, /**< Flush all DMA queues first */ /* These *HALT* flags aren't supported yet -- they will be used to support the full-screen DGA-like mode. */ - _DRM_HALT_ALL_QUEUES = 0x10, /* Halt all current and future queues */ - _DRM_HALT_CUR_QUEUES = 0x20 /* Halt all current queues */ + _DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */ + _DRM_HALT_CUR_QUEUES = 0x20 /**< Halt all current queues */ } drm_lock_flags_t; + +/** + * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type. + * + * \sa drmGetLock() and drmUnlock(). + */ typedef struct drm_lock { int context; drm_lock_flags_t flags; } drm_lock_t; -typedef enum drm_dma_flags { /* These values *MUST* match xf86drm.h */ - /* Flags for DMA buffer dispatch */ - _DRM_DMA_BLOCK = 0x01, /* Block until buffer dispatched. - Note, the buffer may not yet have - been processed by the hardware -- - getting a hardware lock with the - hardware quiescent will ensure - that the buffer has been - processed. */ - _DRM_DMA_WHILE_LOCKED = 0x02, /* Dispatch while lock held */ - _DRM_DMA_PRIORITY = 0x04, /* High priority dispatch */ + +/** + * DMA flags + * + * \warning + * These values \e must match xf86drm.h. + * + * \sa drm_dma. + */ +typedef enum drm_dma_flags { + /* Flags for DMA buffer dispatch */ + _DRM_DMA_BLOCK = 0x01, /**< + * Block until buffer dispatched. + * + * \note The buffer may not yet have + * been processed by the hardware -- + * getting a hardware lock with the + * hardware quiescent will ensure + * that the buffer has been + * processed. + */ + _DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */ + _DRM_DMA_PRIORITY = 0x04, /**< High priority dispatch */ - /* Flags for DMA buffer request */ - _DRM_DMA_WAIT = 0x10, /* Wait for free buffers */ - _DRM_DMA_SMALLER_OK = 0x20, /* Smaller-than-requested buffers ok */ - _DRM_DMA_LARGER_OK = 0x40 /* Larger-than-requested buffers ok */ + /* Flags for DMA buffer request */ + _DRM_DMA_WAIT = 0x10, /**< Wait for free buffers */ + _DRM_DMA_SMALLER_OK = 0x20, /**< Smaller-than-requested buffers OK */ + _DRM_DMA_LARGER_OK = 0x40 /**< Larger-than-requested buffers OK */ } drm_dma_flags_t; + +/** + * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type. + * + * \sa drmAddBufs(). + */ typedef struct drm_buf_desc { - int count; /* Number of buffers of this size */ - int size; /* Size in bytes */ - int low_mark; /* Low water mark */ - int high_mark; /* High water mark */ + int count; /**< Number of buffers of this size */ + int size; /**< Size in bytes */ + int low_mark; /**< Low water mark */ + int high_mark; /**< High water mark */ enum { - _DRM_PAGE_ALIGN = 0x01, /* Align on page boundaries for DMA */ - _DRM_AGP_BUFFER = 0x02, /* Buffer is in agp space */ - _DRM_SG_BUFFER = 0x04 /* Scatter/gather memory buffer */ + _DRM_PAGE_ALIGN = 0x01, /**< Align on page boundaries for DMA */ + _DRM_AGP_BUFFER = 0x02, /**< Buffer is in AGP space */ + _DRM_SG_BUFFER = 0x04 /**< Scatter/gather memory buffer */ } flags; - unsigned long agp_start; /* Start address of where the agp buffers - * are in the agp aperture */ + unsigned long agp_start; /**< + * Start address of where the AGP buffers are + * in the AGP aperture + */ } drm_buf_desc_t; + +/** + * DRM_IOCTL_INFO_BUFS ioctl argument type. + */ typedef struct drm_buf_info { - int count; /* Entries in list */ + int count; /**< Entries in list */ drm_buf_desc_t *list; } drm_buf_info_t; + +/** + * DRM_IOCTL_FREE_BUFS ioctl argument type. + */ typedef struct drm_buf_free { int count; int *list; } drm_buf_free_t; + +/** + * Buffer information + * + * \sa drm_buf_map. + */ typedef struct drm_buf_pub { - int idx; /* Index into master buflist */ - int total; /* Buffer size */ - int used; /* Amount of buffer in use (for DMA) */ - void *address; /* Address of buffer */ + int idx; /**< Index into the master buffer list */ + int total; /**< Buffer size */ + int used; /**< Amount of buffer in use (for DMA) */ + void *address; /**< Address of buffer */ } drm_buf_pub_t; + +/** + * DRM_IOCTL_MAP_BUFS ioctl argument type. + */ typedef struct drm_buf_map { - int count; /* Length of buflist */ - void *virtual; /* Mmaped area in user-virtual */ - drm_buf_pub_t *list; /* Buffer information */ + int count; /**< Length of the buffer list */ + void *virtual; /**< Mmap'd area in user-virtual */ + drm_buf_pub_t *list; /**< Buffer information */ } drm_buf_map_t; + +/** + * DRM_IOCTL_DMA ioctl argument type. + * + * Indices here refer to the offset into the buffer list in drm_buf_get. + * + * \sa drmDMA(). + */ typedef struct drm_dma { - /* Indices here refer to the offset into - buflist in drm_buf_get_t. */ - int context; /* Context handle */ - int send_count; /* Number of buffers to send */ - int *send_indices; /* List of handles to buffers */ - int *send_sizes; /* Lengths of data to send */ - drm_dma_flags_t flags; /* Flags */ - int request_count; /* Number of buffers requested */ - int request_size; /* Desired size for buffers */ - int *request_indices; /* Buffer information */ + int context; /**< Context handle */ + int send_count; /**< Number of buffers to send */ + int *send_indices; /**< List of handles to buffers */ + int *send_sizes; /**< Lengths of data to send */ + drm_dma_flags_t flags; /**< Flags */ + int request_count; /**< Number of buffers requested */ + int request_size; /**< Desired size for buffers */ + int *request_indices; /**< Buffer information */ int *request_sizes; - int granted_count; /* Number of buffers granted */ + int granted_count; /**< Number of buffers granted */ } drm_dma_t; + typedef enum { _DRM_CONTEXT_PRESERVED = 0x01, _DRM_CONTEXT_2DONLY = 0x02 } drm_ctx_flags_t; + +/** + * DRM_IOCTL_ADD_CTX ioctl argument type. + * + * \sa drmCreateContext() and drmDestroyContext(). + */ typedef struct drm_ctx { drm_context_t handle; drm_ctx_flags_t flags; } drm_ctx_t; + +/** + * DRM_IOCTL_RES_CTX ioctl argument type. + */ typedef struct drm_ctx_res { int count; drm_ctx_t *contexts; } drm_ctx_res_t; + +/** + * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 16 13:34:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C940216A4D1; Sun, 16 Nov 2003 13:34:35 -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 9CB0316A4CE for ; Sun, 16 Nov 2003 13:34:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 811F243FBD for ; Sun, 16 Nov 2003 13:34:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAGLYYXJ021397 for ; Sun, 16 Nov 2003 13:34:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAGLYYeU021394 for perforce@freebsd.org; Sun, 16 Nov 2003 13:34:34 -0800 (PST) (envelope-from peter@freebsd.org) Message-Id: <200311162134.hAGLYYeU021394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 16 Nov 2003 21:34:36 -0000 X-Original-Date: Sun, 16 Nov 2003 13:34:34 -0800 (PST) X-List-Received-Date: Sun, 16 Nov 2003 21:34:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=42569 Change 42569 by peter@peter_overcee on 2003/11/16 13:34:28 deal with smp_active. This should be MI. Affected files ... .. //depot/projects/hammer/sys/kern/kern_switch.c#12 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_switch.c#12 (text+ko) ==== @@ -97,7 +97,7 @@ #include #include #include -#if defined(SMP) && defined(__i386__) +#if defined(SMP) && (defined(__i386__) || defined(__amd64__)) #include #endif #include @@ -124,7 +124,7 @@ struct thread *td; struct ksegrp *kg; -#if defined(SMP) && defined(__i386__) +#if defined(SMP) && (defined(__i386__) || defined(__amd64__)) if (smp_active == 0 && PCPU_GET(cpuid) != 0) { /* Shutting down, run idlethread on AP's */ td = PCPU_GET(idlethread);