From owner-p4-projects@FreeBSD.ORG Sun Aug 15 19:26:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D6F416A9FB; Sun, 15 Aug 2004 19:26:12 +0000 (GMT) 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 EF83616A987 for ; Sun, 15 Aug 2004 19:26:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9CCE43D31 for ; Sun, 15 Aug 2004 19:26:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7FJQBvZ005494 for ; Sun, 15 Aug 2004 19:26:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7FJPd1t005487 for perforce@freebsd.org; Sun, 15 Aug 2004 19:25:39 GMT (envelope-from peter@freebsd.org) Date: Sun, 15 Aug 2004 19:25:39 GMT Message-Id: <200408151925.i7FJPd1t005487@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 59740 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: Sun, 15 Aug 2004 19:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=59740 Change 59740 by peter@peter_daintree on 2004/08/15 19:24:43 IFC @59738 Affected files ... .. //depot/projects/hammer/MAINTAINERS#26 integrate .. //depot/projects/hammer/Makefile#22 integrate .. //depot/projects/hammer/Makefile.inc1#55 integrate .. //depot/projects/hammer/UPDATING#47 integrate .. //depot/projects/hammer/bin/Makefile.inc#7 integrate .. //depot/projects/hammer/bin/date/date.1#9 integrate .. //depot/projects/hammer/bin/date/vary.c#2 integrate .. //depot/projects/hammer/bin/dd/args.c#6 integrate .. //depot/projects/hammer/bin/ed/Makefile#8 integrate .. //depot/projects/hammer/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/hammer/contrib/bsnmp/VERSION#4 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmp.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmp.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.h#4 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmppriv.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/support.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/lib/support.h#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ip.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_tcp.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_udp.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/FOKUS-MIB.txt#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/action.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/export.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.sh#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.h#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_udp.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trap.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/tree.def#3 integrate .. //depot/projects/hammer/contrib/cvs/src/tag.c#5 integrate .. //depot/projects/hammer/contrib/file/.cvsignore#2 integrate .. //depot/projects/hammer/contrib/file/ChangeLog#1 branch .. //depot/projects/hammer/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/hammer/contrib/file/Localstuff#2 integrate .. //depot/projects/hammer/contrib/file/MAINT#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/adventure#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/amigaos#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/animation#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/apple#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/archive#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/audio#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/bFLT#1 branch .. //depot/projects/hammer/contrib/file/Magdir/bout#1 branch .. //depot/projects/hammer/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/c64#1 branch .. //depot/projects/hammer/contrib/file/Magdir/cad#1 branch .. //depot/projects/hammer/contrib/file/Magdir/chord#1 branch .. //depot/projects/hammer/contrib/file/Magdir/claris#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/commands#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/communications#1 branch .. //depot/projects/hammer/contrib/file/Magdir/compress#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/console#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/dact#1 branch .. //depot/projects/hammer/contrib/file/Magdir/database#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/diff#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/elf#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/fcs#1 branch .. //depot/projects/hammer/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/flash#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/games#1 branch .. //depot/projects/hammer/contrib/file/Magdir/gcc#1 branch .. //depot/projects/hammer/contrib/file/Magdir/geos#1 branch .. //depot/projects/hammer/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/human68k#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ibm6000#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/iff#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/images#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/intel#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/jpeg#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/linux#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/mach#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/maple#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/matroska#1 branch .. //depot/projects/hammer/contrib/file/Magdir/misctools#1 branch .. //depot/projects/hammer/contrib/file/Magdir/motorola#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/netbsd#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/netscape#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ocaml#1 branch .. //depot/projects/hammer/contrib/file/Magdir/os2#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/palm#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/perl#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/plan9#1 branch .. //depot/projects/hammer/contrib/file/Magdir/printer#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/psion#1 branch .. //depot/projects/hammer/contrib/file/Magdir/python#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/revision#1 branch .. //depot/projects/hammer/contrib/file/Magdir/riff#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/sgml#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/sinclair#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sniffer#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/spec#1 branch .. //depot/projects/hammer/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/sun#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ti-8x#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/unknown#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/varied.out#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/varied.script#1 branch .. //depot/projects/hammer/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/vorbis#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/wordprocessors#1 branch .. //depot/projects/hammer/contrib/file/Magdir/xwindows#1 branch .. //depot/projects/hammer/contrib/file/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/file/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/file/README#4 integrate .. //depot/projects/hammer/contrib/file/acinclude.m4#3 integrate .. //depot/projects/hammer/contrib/file/aclocal.m4#4 integrate .. //depot/projects/hammer/contrib/file/apprentice.c#4 integrate .. //depot/projects/hammer/contrib/file/apptype.c#1 branch .. //depot/projects/hammer/contrib/file/ascmagic.c#4 integrate .. //depot/projects/hammer/contrib/file/compress.c#3 integrate .. //depot/projects/hammer/contrib/file/config.h.in#4 integrate .. //depot/projects/hammer/contrib/file/configure#4 integrate .. //depot/projects/hammer/contrib/file/configure.in#4 integrate .. //depot/projects/hammer/contrib/file/file.c#4 integrate .. //depot/projects/hammer/contrib/file/file.h#4 integrate .. //depot/projects/hammer/contrib/file/file.man#4 integrate .. //depot/projects/hammer/contrib/file/fsmagic.c#3 integrate .. //depot/projects/hammer/contrib/file/funcs.c#1 branch .. //depot/projects/hammer/contrib/file/is_tar.c#3 integrate .. //depot/projects/hammer/contrib/file/libmagic.man#1 branch .. //depot/projects/hammer/contrib/file/magic.c#1 branch .. //depot/projects/hammer/contrib/file/magic.h#1 branch .. //depot/projects/hammer/contrib/file/magic.man#4 integrate .. //depot/projects/hammer/contrib/file/magic.mime#4 integrate .. //depot/projects/hammer/contrib/file/magic2mime#2 integrate .. //depot/projects/hammer/contrib/file/names.h#3 integrate .. //depot/projects/hammer/contrib/file/patchlevel.h#4 integrate .. //depot/projects/hammer/contrib/file/print.c#4 integrate .. //depot/projects/hammer/contrib/file/readelf.c#4 integrate .. //depot/projects/hammer/contrib/file/readelf.h#3 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#4 integrate .. //depot/projects/hammer/contrib/file/tar.h#2 integrate .. //depot/projects/hammer/contrib/file/test.c#1 branch .. //depot/projects/hammer/contrib/gcc/ChangeLog#9 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.1#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.10#1 branch .. //depot/projects/hammer/contrib/gcc/ChangeLog.2#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.3#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.4#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.5#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.6#3 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.7#2 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog.8#1 branch .. //depot/projects/hammer/contrib/gcc/ChangeLog.9#1 branch .. //depot/projects/hammer/contrib/gcc/Makefile.in#9 integrate .. //depot/projects/hammer/contrib/gcc/README.Portability#3 integrate .. //depot/projects/hammer/contrib/gcc/acconfig.h#2 delete .. //depot/projects/hammer/contrib/gcc/aclocal.m4#4 integrate .. //depot/projects/hammer/contrib/gcc/alias.c#6 integrate .. //depot/projects/hammer/contrib/gcc/alloc-pool.c#1 branch .. //depot/projects/hammer/contrib/gcc/alloc-pool.h#1 branch .. //depot/projects/hammer/contrib/gcc/ansidecl.h#3 integrate .. //depot/projects/hammer/contrib/gcc/attribs.c#4 integrate .. //depot/projects/hammer/contrib/gcc/basic-block.h#4 integrate .. //depot/projects/hammer/contrib/gcc/bb-reorder.c#4 integrate .. //depot/projects/hammer/contrib/gcc/bitmap.c#4 integrate .. //depot/projects/hammer/contrib/gcc/bitmap.h#3 integrate .. //depot/projects/hammer/contrib/gcc/bt-load.c#1 branch .. //depot/projects/hammer/contrib/gcc/builtin-attrs.def#3 integrate .. //depot/projects/hammer/contrib/gcc/builtin-types.def#4 integrate .. //depot/projects/hammer/contrib/gcc/builtins.c#6 integrate .. //depot/projects/hammer/contrib/gcc/builtins.def#3 integrate .. //depot/projects/hammer/contrib/gcc/c-aux-info.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-common.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-common.def#3 integrate .. //depot/projects/hammer/contrib/gcc/c-common.h#5 integrate .. //depot/projects/hammer/contrib/gcc/c-convert.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-cppbuiltin.c#1 branch .. //depot/projects/hammer/contrib/gcc/c-decl.c#8 integrate .. //depot/projects/hammer/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-errors.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-format.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-incpath.c#1 branch .. //depot/projects/hammer/contrib/gcc/c-incpath.h#1 branch .. //depot/projects/hammer/contrib/gcc/c-lang.c#4 integrate .. //depot/projects/hammer/contrib/gcc/c-lex.c#6 integrate .. //depot/projects/hammer/contrib/gcc/c-objc-common.c#6 integrate .. //depot/projects/hammer/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/hammer/contrib/gcc/c-pch.c#1 branch .. //depot/projects/hammer/contrib/gcc/c-ppoutput.c#1 branch .. //depot/projects/hammer/contrib/gcc/c-pragma.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-pragma.h#3 integrate .. //depot/projects/hammer/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/hammer/contrib/gcc/c-semantics.c#4 integrate .. //depot/projects/hammer/contrib/gcc/c-tree.h#5 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/hammer/contrib/gcc/c.opt#1 branch .. //depot/projects/hammer/contrib/gcc/caller-save.c#3 integrate .. //depot/projects/hammer/contrib/gcc/calls.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cfg.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cfganal.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cfgbuild.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cfgcleanup.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cfghooks.c#1 branch .. //depot/projects/hammer/contrib/gcc/cfghooks.h#1 branch .. //depot/projects/hammer/contrib/gcc/cfglayout.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cfglayout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/cfgloop.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cfgloop.h#1 branch .. //depot/projects/hammer/contrib/gcc/cfgloopanal.c#1 branch .. //depot/projects/hammer/contrib/gcc/cfgloopmanip.c#1 branch .. //depot/projects/hammer/contrib/gcc/cfgrtl.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cgraph.c#1 branch .. //depot/projects/hammer/contrib/gcc/cgraph.h#1 branch .. //depot/projects/hammer/contrib/gcc/cgraphunit.c#1 branch .. //depot/projects/hammer/contrib/gcc/collect2.c#5 integrate .. //depot/projects/hammer/contrib/gcc/collect2.h#3 integrate .. //depot/projects/hammer/contrib/gcc/combine.c#6 integrate .. //depot/projects/hammer/contrib/gcc/common.opt#1 branch .. //depot/projects/hammer/contrib/gcc/config.build#1 branch .. //depot/projects/hammer/contrib/gcc/config.gcc#6 integrate .. //depot/projects/hammer/contrib/gcc/config.guess#3 delete .. //depot/projects/hammer/contrib/gcc/config.host#1 branch .. //depot/projects/hammer/contrib/gcc/config.in#5 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha-interix.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha-modes.def#1 branch .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha-protos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.c#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.md#5 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha32.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/elf.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/ev4.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/ev5.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/ev6.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/freebsd.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/gnu.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/lib1funcs.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/linux-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/linux.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/netbsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/openbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/osf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/osf5.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/t-interix#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/t-osf-pthread#1 branch .. //depot/projects/hammer/contrib/gcc/config/alpha/t-osf4#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/unicosmk.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-cc.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-crt0-64.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-crt0.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-dwarf2.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-ld.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-psxcrt0-64.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms-psxcrt0.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vms_tramp.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/vxworks.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/xm-alpha-interix.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/xm-vms.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/xm-vms64.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/aoutos.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/README-interworking#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/aof.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm-protos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/cirrus.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/coff.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/conix-elf.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/arm/crtn.asm#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/fpa.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/ieee754-df.S#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/ieee754-sf.S#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/iwmmxt.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/kaos-arm.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/kaos-strongarm.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/linux-elf.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/linux-gas.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/mmintrin.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/netbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/pe.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/pe.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/rtems-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/semi.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/semiaof.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-arm-aout#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-arm-elf#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-netbsd#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-pe#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-strongarm-coff#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/t-vxworks#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/t-wince-pe#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/unknown-elf-oabi.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/arm/unknown-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/vxarm.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/arm/vxworks.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/wince-pe.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/arm/xscale-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin-c.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin-protos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/dbx.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/dbxcoff.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/dbxelf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/elfos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/fp-bit.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/fp-bit.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#10 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd3.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/freebsd4.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/freebsd5.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/freebsd6.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/frv/cmovd.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/cmovh.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/cmovw.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv-abi.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv-asm.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv-protos.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frv.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frvbegin.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/frvend.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/lib1funcs.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/frv/t-frv#2 integrate .. //depot/projects/hammer/contrib/gcc/config/gnu.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/gofast.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/att.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/beos-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/bsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/crtdll.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/cygming.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/cygwin.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/cygwin1.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/cygwin2.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/djgpp.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd-aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#11 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#8 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/gas.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/gnu.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/gthr-win32.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-coff.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-interix.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-interix3.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#12 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.h#8 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.md#6 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/kaos-i386.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/kfreebsdgnu.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/linux-aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/linux.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/linux64.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/lynx-ng.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/lynx.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/mingw32.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/mmintrin.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/moss.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/netbsd-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/netbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/netbsd64.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/nto.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/openbsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/ptx4-i.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/rtemself.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sco5.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sol2.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/svr3dbx.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/svr3gas.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sysv3.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sysv4.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/sysv5.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-beos#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-cygming#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/t-cygwin#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-interix#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-nto#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/t-sco5#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/t-vxworks#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/unix.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/uwin.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/vsta.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/vxi386.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/i386/vxworks.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/win32.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/i386/winnt.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/x-mingw32#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/x86-64.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/xm-i386-interix.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/xm-vsta.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/i386/xmmintrin.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/aix.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/ia64/crtbegin.asm#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/crtend.asm#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/hpux.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/hpux_longdouble.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.md#5 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/itanium1.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/ia64/itanium2.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/linux.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/quadlib.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/sysv4.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/t-aix#3 delete .. //depot/projects/hammer/contrib/gcc/config/ia64/t-hpux#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/t-ia64#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/unwind-aix.c#2 delete .. //depot/projects/hammer/contrib/gcc/config/ia64/unwind-ia64.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/interix.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/kaos.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/kfreebsdgnu.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/libgloss.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/linux-aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/linux.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/lynx-ng.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/lynx.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/netbsd-aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/netbsd-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/netbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/openbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/psos.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/ptx4.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/40x.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/440.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/603.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/6xx.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/7450.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/7xx.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/8540.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix31.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix3newas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix41.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix43.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix51.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec-defs.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/beos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/biarch64.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/darwin-ldouble.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/darwin.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/default64.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabi.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabiaix.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabisim.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/gnu.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/host-darwin.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/kaos-ppc.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/libgcc-ppc64.ver#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux64.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linuxspe.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/lynx.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/lynxbase.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/mach.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/mpc.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/netbsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/power4.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/power5.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/ppc-asm.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rios1.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/rios2.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#8 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.md#8 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs64.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/rtems.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#8 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4le.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-darwin#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-fprules#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-linux64#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-newas#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-ppccomm#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-ppcgas#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-rs6000#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-rs6000-c-rule#2 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-spe#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/t-vxworks#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/vxppc.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/vxworks.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/x-darwin#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/x-linux64#1 branch .. //depot/projects/hammer/contrib/gcc/config/rs6000/xcoff.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/2064.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/s390/2084.md#1 branch .. //depot/projects/hammer/contrib/gcc/config/s390/fixdfdi.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/linux.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390-protos.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390.md#3 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/s390/t-tpf#1 branch .. //depot/projects/hammer/contrib/gcc/config/s390/tpf.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/aout.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/bsd.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#8 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/gmon-sol2.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/hal.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/linux-aout.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/linux.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/linux64.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/lite.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/litecoff.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/liteelf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/lynx-ng.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/lynx.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/netbsd-elf.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/netbsd.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/openbsd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/pbd.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-bi.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-gld-bi.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-gld.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol26-sld.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sp64-aout.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sp64-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sp86x-aout.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sp86x-elf.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc-protos.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.c#7 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.md#5 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/splet.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sun4gas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sun4o3.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sunos4.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sysv4-only.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/sparc/sysv4.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-chorus-elf#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-halos#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-sol2#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-sparcbare#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-splet#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-sunos41#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-vxsparc#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/t-vxsparc64#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/vxsim.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/vxsparc.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/vxsparc64.h#3 delete .. //depot/projects/hammer/contrib/gcc/config/svr3.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/svr4.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-darwin#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-freebsd#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-gnu#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-interix#2 delete .. //depot/projects/hammer/contrib/gcc/config/t-kfreebsd-gnu#1 branch .. //depot/projects/hammer/contrib/gcc/config/t-libunwind#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-linux#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-linux-aout#2 delete .. //depot/projects/hammer/contrib/gcc/config/t-netbsd#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-openbsd#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-rtems#2 integrate .. //depot/projects/hammer/contrib/gcc/config/t-slibgcc-darwin#1 branch .. //depot/projects/hammer/contrib/gcc/config/t-slibgcc-elf-ver#3 integrate .. //depot/projects/hammer/contrib/gcc/config/t-vxworks#1 branch .. //depot/projects/hammer/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/vxlib.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/vxworks.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/windiss.h#1 branch .. //depot/projects/hammer/contrib/gcc/configure#7 integrate .. //depot/projects/hammer/contrib/gcc/configure.ac#1 branch .. //depot/projects/hammer/contrib/gcc/configure.frag#2 delete .. //depot/projects/hammer/contrib/gcc/configure.in#7 delete .. //depot/projects/hammer/contrib/gcc/conflict.c#3 integrate .. //depot/projects/hammer/contrib/gcc/convert.c#4 integrate .. //depot/projects/hammer/contrib/gcc/convert.h#2 integrate .. //depot/projects/hammer/contrib/gcc/coretypes.h#1 branch .. //depot/projects/hammer/contrib/gcc/coverage.c#1 branch .. //depot/projects/hammer/contrib/gcc/coverage.h#1 branch .. //depot/projects/hammer/contrib/gcc/cp-demangle.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp-demangle.h#1 branch .. //depot/projects/hammer/contrib/gcc/cp-demint.c#1 branch .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog.1#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog.2#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog.3#1 branch .. //depot/projects/hammer/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/NEWS#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/call.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/cfns.gperf#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/class.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/config-lang.in#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-lang.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.def#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.h#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/cxx-pretty-print.c#1 branch .. //depot/projects/hammer/contrib/gcc/cp/cxx-pretty-print.h#1 branch .. //depot/projects/hammer/contrib/gcc/cp/decl.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.h#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl2.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/dump.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/except.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/expr.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/friend.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/g++spec.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/init.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/lang-options.h#3 delete .. //depot/projects/hammer/contrib/gcc/cp/lang-specs.h#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/lex.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/lex.h#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/method.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/name-lookup.c#1 branch .. //depot/projects/hammer/contrib/gcc/cp/name-lookup.h#1 branch .. //depot/projects/hammer/contrib/gcc/cp/operators.def#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/optimize.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/parse.y#6 delete .. //depot/projects/hammer/contrib/gcc/cp/parser.c#1 branch .. //depot/projects/hammer/contrib/gcc/cp/pt.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/ptree.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/repo.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/rtti.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/search.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/spew.c#4 delete .. //depot/projects/hammer/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cplus-dem.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cppcharset.c#1 branch .. //depot/projects/hammer/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cppdefault.h#3 integrate .. //depot/projects/hammer/contrib/gcc/cpperror.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cppexp.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cppfiles.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cpphash.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cpphash.h#3 integrate .. //depot/projects/hammer/contrib/gcc/cppinit.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cpplex.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cpplib.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cpplib.h#4 integrate .. //depot/projects/hammer/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cppmain.c#4 delete .. //depot/projects/hammer/contrib/gcc/cpppch.c#1 branch .. //depot/projects/hammer/contrib/gcc/cppspec.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cpptrad.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cppucnid.h#1 branch .. //depot/projects/hammer/contrib/gcc/cppucnid.pl#1 branch .. //depot/projects/hammer/contrib/gcc/cppucnid.tab#1 branch .. //depot/projects/hammer/contrib/gcc/crtstuff.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cse.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cselib.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cselib.h#3 integrate .. //depot/projects/hammer/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/hammer/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/hammer/contrib/gcc/dbxstclass.h#2 delete .. //depot/projects/hammer/contrib/gcc/debug.c#3 integrate .. //depot/projects/hammer/contrib/gcc/debug.h#3 integrate .. //depot/projects/hammer/contrib/gcc/defaults.h#4 integrate .. //depot/projects/hammer/contrib/gcc/demangle.h#3 integrate .. //depot/projects/hammer/contrib/gcc/df.c#3 integrate .. //depot/projects/hammer/contrib/gcc/df.h#3 integrate .. //depot/projects/hammer/contrib/gcc/diagnostic.c#3 integrate .. //depot/projects/hammer/contrib/gcc/diagnostic.def#3 integrate .. //depot/projects/hammer/contrib/gcc/diagnostic.h#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/bugreport.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/c-tree.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/compat.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/configfiles.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/configterms.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/contrib.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/cpp.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/doc/cppenv.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/cppopts.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/fragments.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/frontends.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/gcc.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/gccint.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/gcov.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/gcc-common.texi#6 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/texinfo.tex#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/install-old.texi#2 delete .. //depot/projects/hammer/contrib/gcc/doc/install.texi#3 delete .. //depot/projects/hammer/contrib/gcc/doc/install.texi2html#2 delete .. //depot/projects/hammer/contrib/gcc/doc/interface.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#9 integrate .. //depot/projects/hammer/contrib/gcc/doc/libgcc.texi#1 branch .. //depot/projects/hammer/contrib/gcc/doc/makefile.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/md.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/objc.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/passes.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/portability.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/rtl.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/sourcebuild.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/standards.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/tm.texi#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/trouble.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/dojump.c#1 branch .. //depot/projects/hammer/contrib/gcc/doloop.c#5 integrate .. //depot/projects/hammer/contrib/gcc/dominance.c#3 integrate .. //depot/projects/hammer/contrib/gcc/doschk.c#3 delete .. //depot/projects/hammer/contrib/gcc/dummy-conditions.c#2 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2.h#3 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2asm.c#3 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2asm.h#3 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2out.c#6 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2out.h#3 integrate .. //depot/projects/hammer/contrib/gcc/emit-rtl.c#6 integrate .. //depot/projects/hammer/contrib/gcc/errors.c#2 integrate .. //depot/projects/hammer/contrib/gcc/errors.h#3 integrate .. //depot/projects/hammer/contrib/gcc/et-forest.c#2 integrate .. //depot/projects/hammer/contrib/gcc/et-forest.h#2 integrate .. //depot/projects/hammer/contrib/gcc/except.c#3 integrate .. //depot/projects/hammer/contrib/gcc/except.h#3 integrate .. //depot/projects/hammer/contrib/gcc/explow.c#4 integrate .. //depot/projects/hammer/contrib/gcc/expmed.c#5 integrate .. //depot/projects/hammer/contrib/gcc/expr.c#8 integrate .. //depot/projects/hammer/contrib/gcc/expr.h#6 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#8 integrate .. //depot/projects/hammer/contrib/gcc/f/Make-lang.in#4 integrate .. //depot/projects/hammer/contrib/gcc/f/README#2 delete .. //depot/projects/hammer/contrib/gcc/f/ansify.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/bad.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/bld.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/bld.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/bugs.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/f/com-rt.def#2 integrate .. //depot/projects/hammer/contrib/gcc/f/com.c#4 integrate .. //depot/projects/hammer/contrib/gcc/f/com.h#3 integrate .. //depot/projects/hammer/contrib/gcc/f/data.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/equiv.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/expr.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/ffe.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/f/fini.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/g77.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/f/g77spec.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/global.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/global.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/implic.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/info.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/intdoc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/intdoc.in#3 integrate .. //depot/projects/hammer/contrib/gcc/f/intdoc.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/f/intrin.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/invoke.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/f/lab.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/lab.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/lang-options.h#2 delete .. //depot/projects/hammer/contrib/gcc/f/lang-specs.h#4 integrate .. //depot/projects/hammer/contrib/gcc/f/lang.opt#1 branch .. //depot/projects/hammer/contrib/gcc/f/lex.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/malloc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/name.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/news.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/f/parse.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/proj.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/root.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/f/src.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/st.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/sta.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/stb.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/stb.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/stc.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/stc.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/std.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/std.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/ste.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/ste.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/storag.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/storag.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/str.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/stt.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/stw.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/symbol.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/symbol.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/target.c#4 integrate .. //depot/projects/hammer/contrib/gcc/f/target.h#4 integrate .. //depot/projects/hammer/contrib/gcc/f/top.c#3 integrate .. //depot/projects/hammer/contrib/gcc/f/top.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/type.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/where.c#3 integrate .. //depot/projects/hammer/contrib/gcc/fibheap.c#3 integrate .. //depot/projects/hammer/contrib/gcc/fibheap.h#3 integrate .. //depot/projects/hammer/contrib/gcc/filenames.h#1 branch .. //depot/projects/hammer/contrib/gcc/final.c#5 integrate .. //depot/projects/hammer/contrib/gcc/fix-header.c#3 integrate .. //depot/projects/hammer/contrib/gcc/fixproto#3 integrate .. //depot/projects/hammer/contrib/gcc/flags.h#5 integrate .. //depot/projects/hammer/contrib/gcc/floatlib.c#2 delete .. //depot/projects/hammer/contrib/gcc/flow.c#6 integrate .. //depot/projects/hammer/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/hammer/contrib/gcc/fp-test.c#2 integrate .. //depot/projects/hammer/contrib/gcc/function.c#7 integrate .. //depot/projects/hammer/contrib/gcc/function.h#3 integrate .. //depot/projects/hammer/contrib/gcc/future.options#2 delete .. //depot/projects/hammer/contrib/gcc/gbl-ctors.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gcc.c#8 integrate .. //depot/projects/hammer/contrib/gcc/gcc.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gccbug.in#3 integrate .. //depot/projects/hammer/contrib/gcc/gccspec.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gcov-dump.c#1 branch .. //depot/projects/hammer/contrib/gcc/gcov-io.c#1 branch .. //depot/projects/hammer/contrib/gcc/gcov-io.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gcov-iov.c#1 branch .. //depot/projects/hammer/contrib/gcc/gcov.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gcse.c#4 integrate .. //depot/projects/hammer/contrib/gcc/gdbinit.in#3 integrate .. //depot/projects/hammer/contrib/gcc/gen-protos.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genattr.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genattrtab.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genattrtab.h#2 integrate .. //depot/projects/hammer/contrib/gcc/genautomata.c#2 integrate .. //depot/projects/hammer/contrib/gcc/gencheck.c#2 integrate .. //depot/projects/hammer/contrib/gcc/gencodes.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genconditions.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genconfig.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genconstants.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genemit.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genextract.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genflags.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gengenrtl.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gengtype-lex.l#2 integrate .. //depot/projects/hammer/contrib/gcc/gengtype-yacc.y#2 integrate .. //depot/projects/hammer/contrib/gcc/gengtype.c#2 integrate .. //depot/projects/hammer/contrib/gcc/gengtype.h#2 integrate .. //depot/projects/hammer/contrib/gcc/genmodes.c#1 branch .. //depot/projects/hammer/contrib/gcc/genmultilib#3 integrate .. //depot/projects/hammer/contrib/gcc/genopinit.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genoutput.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genpeep.c#2 integrate .. //depot/projects/hammer/contrib/gcc/genpreds.c#3 integrate .. //depot/projects/hammer/contrib/gcc/genrecog.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gensupport.c#3 integrate .. //depot/projects/hammer/contrib/gcc/gensupport.h#3 integrate .. //depot/projects/hammer/contrib/gcc/ggc-common.c#3 integrate .. //depot/projects/hammer/contrib/gcc/ggc-none.c#3 integrate .. //depot/projects/hammer/contrib/gcc/ggc-page.c#3 integrate .. //depot/projects/hammer/contrib/gcc/ggc-simple.c#3 integrate .. //depot/projects/hammer/contrib/gcc/ggc-zone.c#1 branch .. //depot/projects/hammer/contrib/gcc/ggc.h#3 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/float.h#2 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/iso646.h#2 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/stdarg.h#4 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/stdbool.h#2 integrate .. //depot/projects/hammer/contrib/gcc/ginclude/stddef.h#3 integrate .. //depot/projects/hammer/contrib/gcc/global.c#4 integrate .. //depot/projects/hammer/contrib/gcc/graph.c#3 integrate .. //depot/projects/hammer/contrib/gcc/graph.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr-dce.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr-gnat.c#1 branch .. //depot/projects/hammer/contrib/gcc/gthr-gnat.h#1 branch .. //depot/projects/hammer/contrib/gcc/gthr-posix.c#1 branch .. //depot/projects/hammer/contrib/gcc/gthr-posix.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr-rtems.h#4 integrate .. //depot/projects/hammer/contrib/gcc/gthr-solaris.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr-vxworks.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr-win32.h#3 integrate .. //depot/projects/hammer/contrib/gcc/gthr.h#3 integrate .. //depot/projects/hammer/contrib/gcc/haifa-sched.c#4 integrate .. //depot/projects/hammer/contrib/gcc/hard-reg-set.h#3 integrate .. //depot/projects/hammer/contrib/gcc/hashtab.c#4 integrate .. //depot/projects/hammer/contrib/gcc/hashtab.h#3 integrate .. //depot/projects/hammer/contrib/gcc/hashtable.c#3 integrate .. //depot/projects/hammer/contrib/gcc/hashtable.h#3 integrate .. //depot/projects/hammer/contrib/gcc/hex.c#3 integrate .. //depot/projects/hammer/contrib/gcc/hooks.c#5 integrate .. //depot/projects/hammer/contrib/gcc/hooks.h#5 integrate .. //depot/projects/hammer/contrib/gcc/host-default.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 15 19:54:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B529B16AE9C; Sun, 15 Aug 2004 19:54:48 +0000 (GMT) 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 7209B16AE9A for ; Sun, 15 Aug 2004 19:54:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5700943D31 for ; Sun, 15 Aug 2004 19:54:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7FJsmkP007725 for ; Sun, 15 Aug 2004 19:54:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7FJsllE007722 for perforce@freebsd.org; Sun, 15 Aug 2004 19:54:47 GMT (envelope-from peter@freebsd.org) Date: Sun, 15 Aug 2004 19:54:47 GMT Message-Id: <200408151954.i7FJsllE007722@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 59744 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: Sun, 15 Aug 2004 19:54:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=59744 Change 59744 by peter@peter_daintree on 2004/08/15 19:54:09 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#16 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#97 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#98 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#51 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#50 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#39 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#22 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#43 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#16 (text+ko) ==== @@ -40,8 +40,7 @@ { struct acpi_softc *sc; - sc = device_get_softc(dev); - + sc = devclass_get_softc(devclass_find("acpi"), 0); acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#29 (text+ko) ==== @@ -102,14 +102,12 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); - void elf64_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) { } - /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#26 (text+ko) ==== @@ -212,8 +212,7 @@ * For stray and threaded interrupts, we mask and EOI the * source. */ - isrc->is_pic->pic_disable_source(isrc); - isrc->is_pic->pic_eoi_source(isrc); + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); if (ih == NULL) error = EINVAL; else ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#30 (text+ko) ==== @@ -119,7 +119,7 @@ static const char *ioapic_bus_string(int bus_type); static void ioapic_print_vector(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); -static void ioapic_disable_source(struct intsrc *isrc); +static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); @@ -148,6 +148,12 @@ #endif TUNABLE_INT("hw.apic.mixed_mode", &mixed_mode_active); +static __inline void +_ioapic_eoi_source(struct intsrc *isrc) +{ + lapic_eoi(); +} + static u_int ioapic_read(volatile ioapic_t *apic, int reg) { @@ -225,7 +231,7 @@ } static void -ioapic_disable_source(struct intsrc *isrc) +ioapic_disable_source(struct intsrc *isrc, int eoi) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; @@ -240,6 +246,10 @@ flags); intpin->io_masked = 1; } + + if (eoi == PIC_EOI) + _ioapic_eoi_source(isrc); + mtx_unlock_spin(&icu_lock); } @@ -247,7 +257,7 @@ ioapic_eoi_source(struct intsrc *isrc) { - lapic_eoi(); + _ioapic_eoi_source(isrc); } /* ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#97 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#25 (text+ko) ==== @@ -67,6 +67,11 @@ #include +/* + * Used in /dev/mem drivers and elsewhere + */ +MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); + /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#98 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#51 (text+ko) ==== @@ -747,6 +747,9 @@ ktrsyscall(code, narg, argp); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -810,6 +813,9 @@ */ userret(td, &frame, sticks); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#50 (text+ko) ==== @@ -58,6 +58,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. options PFIL_HOOKS # pfil(9) framework +options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -149,7 +150,6 @@ # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge -#device pcic # ExCA ISA and PCI bridges device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus ==== //depot/projects/hammer/sys/amd64/conf/NOTES#39 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1166) +# (XXX from i386:NOTES,v 1.1167) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.15 2004/08/01 11:40:51 markm Exp $ # ==== //depot/projects/hammer/sys/amd64/include/cpu.h#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/critical.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/elf.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#13 (text+ko) ==== @@ -50,7 +50,7 @@ */ struct pic { void (*pic_enable_source)(struct intsrc *); - void (*pic_disable_source)(struct intsrc *); + void (*pic_disable_source)(struct intsrc *, int); void (*pic_eoi_source)(struct intsrc *); void (*pic_enable_intr)(struct intsrc *); int (*pic_vector)(struct intsrc *); @@ -61,6 +61,12 @@ enum intr_polarity); }; +/* Flags for pic_disable_source() */ +enum { + PIC_EOI, + PIC_NO_EOI, +}; + /* * An interrupt source. The upper-layer code uses the PIC methods to * control a given source. The lower-layer PIC drivers can store additional ==== //depot/projects/hammer/sys/amd64/include/param.h#22 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#43 (text+ko) ==== @@ -140,7 +140,7 @@ }; static void atpic_enable_source(struct intsrc *isrc); -static void atpic_disable_source(struct intsrc *isrc); +static void atpic_disable_source(struct intsrc *isrc, int eoi); static void atpic_eoi_master(struct intsrc *isrc); static void atpic_eoi_slave(struct intsrc *isrc); static void atpic_enable_intr(struct intsrc *isrc); @@ -177,6 +177,35 @@ CTASSERT(sizeof(atintrs) / sizeof(atintrs[0]) == NUM_ISA_IRQS); +static __inline void +_atpic_eoi_master(struct intsrc *isrc) +{ + + KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, + ("%s: mismatched pic", __func__)); +#ifndef AUTO_EOI_1 + outb(atpics[MASTER].at_ioaddr, OCW2_EOI); +#endif +} + +/* + * The data sheet says no auto-EOI on slave, but it sometimes works. + * So, if AUTO_EOI_2 is enabled, we use it. + */ +static __inline void +_atpic_eoi_slave(struct intsrc *isrc) +{ + + KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, + ("%s: mismatched pic", __func__)); +#ifndef AUTO_EOI_2 + outb(atpics[SLAVE].at_ioaddr, OCW2_EOI); +#ifndef AUTO_EOI_1 + outb(atpics[MASTER].at_ioaddr, OCW2_EOI); +#endif +#endif +} + static void atpic_enable_source(struct intsrc *isrc) { @@ -192,48 +221,48 @@ } static void -atpic_disable_source(struct intsrc *isrc) +atpic_disable_source(struct intsrc *isrc, int eoi) { struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; struct atpic *ap = (struct atpic *)isrc->is_pic; - if (ai->at_trigger == INTR_TRIGGER_EDGE) - return; mtx_lock_spin(&icu_lock); - *ap->at_imen |= IMEN_MASK(ai); - outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); + if (ai->at_trigger != INTR_TRIGGER_EDGE) { + *ap->at_imen |= IMEN_MASK(ai); + outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); + } + + /* + * Take care to call these functions directly instead of through + * a function pointer. All of the referenced variables should + * still be hot in the cache. + */ + if (eoi == PIC_EOI) { + if (isrc->is_pic == &atpics[MASTER].at_pic) + _atpic_eoi_master(isrc); + else + _atpic_eoi_slave(isrc); + } + mtx_unlock_spin(&icu_lock); } static void atpic_eoi_master(struct intsrc *isrc) { - - KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, - ("%s: mismatched pic", __func__)); #ifndef AUTO_EOI_1 mtx_lock_spin(&icu_lock); - outb(atpics[MASTER].at_ioaddr, OCW2_EOI); + _atpic_eoi_master(isrc); mtx_unlock_spin(&icu_lock); #endif } -/* - * The data sheet says no auto-EOI on slave, but it sometimes works. - * So, if AUTO_EOI_2 is enabled, we use it. - */ static void atpic_eoi_slave(struct intsrc *isrc) { - - KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, - ("%s: mismatched pic", __func__)); #ifndef AUTO_EOI_2 mtx_lock_spin(&icu_lock); - outb(atpics[SLAVE].at_ioaddr, OCW2_EOI); -#ifndef AUTO_EOI_1 - outb(atpics[MASTER].at_ioaddr, OCW2_EOI); -#endif + _atpic_eoi_slave(isrc); mtx_unlock_spin(&icu_lock); #endif } From owner-p4-projects@FreeBSD.ORG Sun Aug 15 23:58:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D16F516A4D0; Sun, 15 Aug 2004 23:58:48 +0000 (GMT) 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 A691416A4CE for ; Sun, 15 Aug 2004 23:58:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8804E43D2F for ; Sun, 15 Aug 2004 23:58:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7FNwmdo025690 for ; Sun, 15 Aug 2004 23:58:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7FNwm0p025687 for perforce@freebsd.org; Sun, 15 Aug 2004 23:58:48 GMT (envelope-from peter@freebsd.org) Date: Sun, 15 Aug 2004 23:58:48 GMT Message-Id: <200408152358.i7FNwm0p025687@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 59759 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: Sun, 15 Aug 2004 23:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=59759 Change 59759 by peter@peter_daintree on 2004/08/15 23:58:33 argh! what a f*cking mess. :-( Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mem.c#26 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#26 (text+ko) ==== @@ -67,11 +67,6 @@ #include -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); - /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) From owner-p4-projects@FreeBSD.ORG Mon Aug 16 02:45:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 169D516A4D0; Mon, 16 Aug 2004 02:45:17 +0000 (GMT) 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 E4C3516A4CE for ; Mon, 16 Aug 2004 02:45:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4D1E43D53 for ; Mon, 16 Aug 2004 02:45:16 +0000 (GMT) (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.11/8.12.11) with ESMTP id i7G2jGiV038903 for ; Mon, 16 Aug 2004 02:45:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7G2jG42038900 for perforce@freebsd.org; Mon, 16 Aug 2004 02:45:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Aug 2004 02:45:16 GMT Message-Id: <200408160245.i7G2jG42038900@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 59774 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, 16 Aug 2004 02:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=59774 Change 59774 by rwatson@rwatson_paprika on 2004/08/16 02:44:45 Integrate netperf_socket from FreeBSD CVS: More VM locking. KQueue locking (yehaw!). Linux emulation timeval bits broken out from FreeBSD bits. Less sio on sparc64. More hme on non-sparc64. USB tweaks. pfs_exit() fix to not hold mutex over vgone(). pfind() no longer returns PRS_NEW processes. kdb_stop_cpus sysctl. More pipe optimization. Loop back UNIX domain socket comments from rwatson_netperf. MP_WATCHDOG. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#17 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#35 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#26 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#9 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#13 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#4 integrate .. //depot/projects/netperf_socket/sys/dev/exca/exca.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_alpha.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_sparc64.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ums.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/urio.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_watchdog.c#1 branch .. //depot/projects/netperf_socket/sys/i386/include/mp_watchdog.h#1 branch .. //depot/projects/netperf_socket/sys/kern/init_main.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#37 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#16 integrate .. //depot/projects/netperf_socket/sys/modules/hme/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#11 integrate .. //depot/projects/netperf_socket/sys/net/if.c#16 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#19 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#13 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#10 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/uio_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/event.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/eventvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/filedesc.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#22 integrate .. //depot/projects/netperf_socket/sys/sys/selinfo.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#20 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#17 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.165 2004/08/04 18:04:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.166 2004/08/15 20:54:25 alc Exp $"); #include #include @@ -2173,7 +2173,7 @@ /* * this routine is used to modify bits in ptes */ -static void +static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem) { pv_entry_t pv; @@ -2410,7 +2410,7 @@ pmap_emulate_reference(struct vmspace *vm, vm_offset_t v, int user, int write) { pmap_t pmap; - pt_entry_t faultoff, *pte; + pt_entry_t *pte; /* * Convert process and virtual address to physical address. @@ -2427,32 +2427,15 @@ PMAP_LOCK(pmap); pte = pmap_lev3pte(pmap, v); } -#ifdef DEBUG /* These checks are more expensive */ - if (!pmap_pte_v(pte)) - panic("pmap_emulate_reference: invalid pte"); -#if 0 + /* - * Can't do these, because cpu_fork and cpu_swapin call - * pmap_emulate_reference(), and the bits aren't guaranteed, - * for them... + * Another CPU can modify the pmap between the emulation trap and this + * CPU locking the pmap. As a result, the pte may be inconsistent + * with the access that caused the emulation trap. In such cases, + * invalidate this CPU's TLB entry and return. */ - if (write) { - if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE))) - panic("pmap_emulate_reference: write but unwritable"); - if (!(*pte & PG_FOW)) - panic("pmap_emulate_reference: write but not FOW"); - } else { - if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE))) - panic("pmap_emulate_reference: !write but unreadable"); - if (!(*pte & (PG_FOR | PG_FOE))) - panic("pmap_emulate_reference: !write but not FOR|FOE"); - } -#endif - /* Other diagnostics? */ -#endif - KASSERT((*pte & PG_MANAGED) != 0, - ("pmap_emulate_reference(%p, 0x%lx, %d, %d): pa 0x%lx not managed", - curthread, v, user, write, pmap_pte_pa(pte))); + if (!pmap_pte_v(pte)) + goto tbis; /* * Twiddle the appropriate bits to reflect the reference @@ -2463,12 +2446,19 @@ * (2) if it was a write fault, mark page as modified. */ if (write) { - faultoff = PG_FOR | PG_FOE | PG_FOW; + if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE))) + goto tbis; + if (!(*pte & PG_FOW)) + goto tbis; + *pte &= ~(PG_FOR | PG_FOE | PG_FOW); } else { - faultoff = PG_FOR | PG_FOE; + if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE))) + goto tbis; + if (!(*pte & (PG_FOR | PG_FOE))) + goto tbis; + *pte &= ~(PG_FOR | PG_FOE); } - - *pte = (*pte & ~faultoff); +tbis: ALPHA_TBIS(v); PMAP_UNLOCK(pmap); } ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.62 2004/06/17 17:16:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.63 2004/08/15 06:24:40 jmg Exp $"); #include #include @@ -196,6 +196,7 @@ TAILQ_INIT(&softc->work_queue); TAILQ_INIT(&softc->abort_queue); TAILQ_INIT(&softc->user_ccb_queue); + knlist_init(&softc->read_select.si_note, &softc->mtx); return (0); } @@ -336,9 +337,7 @@ softc = (struct targ_softc *)dev->si_drv1; kn->kn_hook = (caddr_t)softc; kn->kn_fop = &targread_filtops; - TARG_LOCK(softc); - SLIST_INSERT_HEAD(&softc->read_select.si_note, kn, kn_selnext); - TARG_UNLOCK(softc); + knlist_add(&softc->read_select.si_note, kn, 0); return (0); } @@ -348,9 +347,7 @@ struct targ_softc *softc; softc = (struct targ_softc *)kn->kn_hook; - TARG_LOCK(softc); - SLIST_REMOVE(&softc->read_select.si_note, kn, knote, kn_selnext); - TARG_UNLOCK(softc); + knlist_remove(&softc->read_select.si_note, kn, 0); } /* Notify the user's kqueue when the user queue or abort queue gets a CCB */ @@ -361,10 +358,8 @@ int retval; softc = (struct targ_softc *)kn->kn_hook; - TARG_LOCK(softc); retval = !TAILQ_EMPTY(&softc->user_ccb_queue) || !TAILQ_EMPTY(&softc->abort_queue); - TARG_UNLOCK(softc); return (retval); } @@ -1096,19 +1091,8 @@ /* If we aborted anything from the work queue, wakeup user. */ if (!TAILQ_EMPTY(&softc->user_ccb_queue) - || !TAILQ_EMPTY(&softc->abort_queue)) { - /* - * XXX KNOTE calls back into targreadfilt, causing a - * lock recursion. So unlock around calls to it although - * this may open up a race allowing a user to submit - * another CCB after we have aborted all pending ones - * A better approach is to mark the softc as dying - * under lock and check for this in targstart(). - */ - TARG_UNLOCK(softc); + || !TAILQ_EMPTY(&softc->abort_queue)) notify_user(softc); - TARG_LOCK(softc); - } } /* Notify the user that data is ready */ @@ -1120,7 +1104,7 @@ * blocking read(). */ selwakeuppri(&softc->read_select, PRIBIO); - KNOTE(&softc->read_select.si_note, 0); + KNOTE_LOCKED(&softc->read_select.si_note, 0); wakeup(&softc->user_ccb_queue); } ==== //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2002 Doug Rabson * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -27,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.155 2004/07/26 07:24:01 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.157 2004/08/15 12:34:15 tjr Exp $"); #include "opt_mac.h" @@ -487,6 +488,7 @@ int linux_select(struct thread *td, struct linux_select_args *args) { + l_timeval ltv; struct timeval tv0, tv1, utv, *tvp; int error; @@ -502,8 +504,10 @@ * time left. */ if (args->timeout) { - if ((error = copyin(args->timeout, &utv, sizeof(utv)))) + if ((error = copyin(args->timeout, <v, sizeof(ltv)))) goto select_out; + utv.tv_sec = ltv.tv_sec; + utv.tv_usec = ltv.tv_usec; #ifdef DEBUG if (ldebug(select)) printf(LMSG("incoming timeout (%ld/%ld)"), @@ -566,7 +570,9 @@ printf(LMSG("outgoing timeout (%ld/%ld)"), utv.tv_sec, utv.tv_usec); #endif - if ((error = copyout(&utv, args->timeout, sizeof(utv)))) + ltv.tv_sec = utv.tv_sec; + ltv.tv_usec = utv.tv_usec; + if ((error = copyout(<v, args->timeout, sizeof(ltv)))) goto select_out; } @@ -913,50 +919,102 @@ return 0; } -/* - * Wrappers for get/setitimer for debugging.. - */ +struct l_itimerval { + l_timeval it_interval; + l_timeval it_value; +}; + int -linux_setitimer(struct thread *td, struct linux_setitimer_args *args) +linux_setitimer(struct thread *td, struct linux_setitimer_args *uap) { - struct setitimer_args bsa; - struct itimerval foo; int error; + caddr_t sg; + struct l_itimerval *lp, *lop, ls; + struct itimerval *p = NULL, *op = NULL, s; #ifdef DEBUG if (ldebug(setitimer)) printf(ARGS(setitimer, "%p, %p"), (void *)args->itv, (void *)args->oitv); #endif - bsa.which = args->which; - bsa.itv = (struct itimerval *)args->itv; - bsa.oitv = (struct itimerval *)args->oitv; - if (args->itv) { - if ((error = copyin(args->itv, &foo, sizeof(foo)))) - return error; + lp = uap->itv; + if (lp != NULL) { + sg = stackgap_init(); + p = stackgap_alloc(&sg, sizeof(struct itimerval)); + uap->itv = (struct l_itimerval *)p; + error = copyin(lp, &ls, sizeof(ls)); + if (error != 0) + return (error); + s.it_interval.tv_sec = ls.it_interval.tv_sec; + s.it_interval.tv_usec = ls.it_interval.tv_usec; + s.it_value.tv_sec = ls.it_value.tv_sec; + s.it_value.tv_usec = ls.it_value.tv_usec; + error = copyout(&s, p, sizeof(s)); + if (error != 0) + return (error); #ifdef DEBUG - if (ldebug(setitimer)) { - printf("setitimer: value: sec: %ld, usec: %ld\n", - foo.it_value.tv_sec, foo.it_value.tv_usec); - printf("setitimer: interval: sec: %ld, usec: %ld\n", - foo.it_interval.tv_sec, foo.it_interval.tv_usec); - } + if (ldebug(setitimer)) { + printf("setitimer: value: sec: %ld, usec: %ld\n", + s.it_value.tv_sec, s.it_value.tv_usec); + printf("setitimer: interval: sec: %ld, usec: %ld\n", + s.it_interval.tv_sec, s.it_interval.tv_usec); + } #endif } - return setitimer(td, &bsa); + lop = uap->oitv; + if (lop != NULL) { + sg = stackgap_init(); + op = stackgap_alloc(&sg, sizeof(struct itimerval)); + uap->oitv = (struct l_itimerval *)op; + } + error = setitimer(td, (struct setitimer_args *) uap); + if (error != 0) + return (error); + if (lop != NULL) { + error = copyin(op, &s, sizeof(s)); + if (error != 0) + return (error); + ls.it_interval.tv_sec = s.it_interval.tv_sec; + ls.it_interval.tv_usec = s.it_interval.tv_usec; + ls.it_value.tv_sec = s.it_value.tv_sec; + ls.it_value.tv_usec = s.it_value.tv_usec; + error = copyout(&ls, lop, sizeof(ls)); + } + return (error); } int -linux_getitimer(struct thread *td, struct linux_getitimer_args *args) +linux_getitimer(struct thread *td, struct linux_getitimer_args *uap) { - struct getitimer_args bsa; + int error; + caddr_t sg; + struct l_itimerval *lp, ls; + struct itimerval *p = NULL, s; + #ifdef DEBUG if (ldebug(getitimer)) printf(ARGS(getitimer, "%p"), (void *)args->itv); #endif - bsa.which = args->which; - bsa.itv = (struct itimerval *)args->itv; - return getitimer(td, &bsa); + lp = uap->itv; + if (lp != NULL) { + sg = stackgap_init(); + p = stackgap_alloc(&sg, sizeof(struct itimerval)); + uap->itv = (struct l_itimerval *)p; + } + error = getitimer(td, (struct getitimer_args *) uap); + if (error != 0) + return (error); + if (lp != NULL) { + error = copyin(p, &s, sizeof(s)); + if (error != 0) + return (error); + ls.it_interval.tv_sec = s.it_interval.tv_sec; + ls.it_interval.tv_usec = s.it_interval.tv_usec; + ls.it_value.tv_sec = s.it_value.tv_sec; + ls.it_value.tv_usec = s.it_value.tv_usec; + error = copyout(&ls, lp, sizeof(ls)); + } + return (error); } #ifndef __alpha__ ==== //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.21 2003/01/02 02:19:10 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.22 2004/08/15 11:52:45 tjr Exp $ */ /* @@ -53,11 +53,12 @@ static __inline void *stackgap_alloc(caddr_t *, size_t); #define szsigcode (*(curthread->td_proc->p_sysent->sv_szsigcode)) +#define psstrings (curthread->td_proc->p_sysent->sv_psstrings) static __inline caddr_t stackgap_init() { - return (caddr_t)(PS_STRINGS - szsigcode - SPARE_USRSPACE); + return (caddr_t)(psstrings - szsigcode - SPARE_USRSPACE); } static __inline void * @@ -68,7 +69,7 @@ void *p = (void *) *sgp; sz = ALIGN(sz); - if (*sgp + sz > (caddr_t)(PS_STRINGS - szsigcode)) + if (*sgp + sz > (caddr_t)(psstrings - szsigcode)) return NULL; *sgp += sz; return p; ==== //depot/projects/netperf_socket/sys/conf/NOTES#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1259 2004/08/14 15:32:18 dwmalone Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1260 2004/08/14 22:38:50 marius Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1631,6 +1631,7 @@ # fxp: Intel EtherExpress Pro/100B # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping) # gx: Intel Pro/1000 Gigabit Ethernet (82542, 82543-F, 82543-T) +# hme: Sun HME (Happy Meal Ethernet) # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. @@ -1732,6 +1733,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) hint.fxp.0.prefer_iomap="0" +device hme # Sun HME (Happy Meal Ethernet) device my # Myson Fast Ethernet (MTD80X, MTD89X) device rl # RealTek 8129/8139 device pcn # AMD Am79C97x PCI 10/100 NICs ==== //depot/projects/netperf_socket/sys/conf/files.i386#26 (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.i386,v 1.502 2004/08/04 20:49:43 markm Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.503 2004/08/15 18:02:09 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -234,6 +234,7 @@ i386/i386/mem.c optional mem i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp +i386/i386/mp_watchdog.c optional mp_watchdog smp i386/i386/mpboot.s optional smp i386/i386/mptable.c optional apic i386/i386/mptable_pci.c optional apic pci ==== //depot/projects/netperf_socket/sys/conf/files.sparc64#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.sparc64,v 1.57 2004/08/12 17:41:29 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.59 2004/08/15 22:59:34 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -23,8 +23,6 @@ dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard -dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa dev/syscons/scgfbrndr.c optional sc dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc @@ -53,14 +51,16 @@ sparc64/fhc/fhc_central.c optional fhc central sparc64/fhc/fhc_nexus.c optional fhc sparc64/isa/isa.c optional isa -sparc64/isa/ofw_isa.c optional ebus -sparc64/isa/ofw_isa.c optional isa +#sparc64/isa/ofw_isa.c optional ebus +#sparc64/isa/ofw_isa.c optional isa +sparc64/isa/ofw_isa.c standard sparc64/pci/apb.c optional pci sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci -sparc64/pci/ofw_pci_if.m optional pci +#sparc64/pci/ofw_pci_if.m optional pci +sparc64/pci/ofw_pci_if.m standard sparc64/pci/psycho.c optional pci sparc64/sbus/sbus.c optional sbus sparc64/sparc64/autoconf.c standard ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#13 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.165 2004/08/13 14:30:26 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.166 2004/08/14 23:53:04 marius Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -299,7 +299,8 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m \ - opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m + opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m \ + sparc64/pci/ofw_pci_if.m .for _srcsrc in ${MFILES} .for _ext in c h ==== //depot/projects/netperf_socket/sys/conf/options.i386#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.212 2004/03/14 23:03:56 imp Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.213 2004/08/15 18:02:09 rwatson Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -15,6 +15,7 @@ POWERFAIL_NMI opt_trap.h PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h +MP_WATCHDOG opt_mp_watchdog.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems ==== //depot/projects/netperf_socket/sys/dev/exca/exca.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.15 2003/10/07 04:29:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.17 2004/08/16 01:57:06 imp Exp $"); #include #include @@ -195,7 +195,8 @@ exca_putb(sc, map->sysmem_stop_msb, (((mem->addr + mem->realsize - 1) >> (EXCA_SYSMEM_ADDRX_SHIFT + 8)) & - EXCA_SYSMEM_ADDRX_STOP_MSB_ADDR_MASK)); + EXCA_SYSMEM_ADDRX_STOP_MSB_ADDR_MASK) | + EXCA_SYSMEM_ADDRX_STOP_MSB_WAIT2); exca_putb(sc, map->sysmem_win, (mem->addr >> EXCA_MEMREG_WIN_SHIFT) & 0xff); @@ -208,14 +209,14 @@ ((mem->kind == PCCARD_A_MEM_ATTR) ? EXCA_CARDMEM_ADDRX_MSB_REGACTIVE_ATTR : 0)); - exca_setb(sc, EXCA_ADDRWIN_ENABLE, map->memenable); #ifdef EXCA_DEBUG if (mem->kind == PCCARD_A_MEM_ATTR) printf("attribtue memory\n"); else printf("common memory\n"); #endif - exca_setb(sc, EXCA_ADDRWIN_ENABLE, EXCA_ADDRWIN_ENABLE_MEMCS16); + exca_setb(sc, EXCA_ADDRWIN_ENABLE, map->memenable | + EXCA_ADDRWIN_ENABLE_MEMCS16); DELAY(100); #ifdef EXCA_DEBUG @@ -228,8 +229,8 @@ r5 = exca_getb(sc, map->cardmem_msb); r6 = exca_getb(sc, map->cardmem_lsb); r7 = exca_getb(sc, map->sysmem_win); - printf("exca_do_mem_map window %d: %02x%02x %02x%02x " - "%02x%02x %02x (%08x+%08x.%08x*%08x)\n", + printf("exca_do_mem_map win %d: %02x%02x %02x%02x " + "%02x%02x %02x (%08x+%06x.%06x*%06x)\n", win, r1, r2, r3, r4, r5, r6, r7, mem->addr, mem->size, mem->realsize, mem->cardaddr); @@ -824,6 +825,73 @@ type, rid, res)); } +#if 0 +static struct resource * +exca_alloc_resource(struct exca_softc *sc, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, uint flags) +{ + struct resource *res = NULL; + int tmp; + + switch (type) { + case SYS_RES_MEMORY: + if (start < cbb_start_mem) + start = cbb_start_mem; + if (end < start) + end = start; + flags = (flags & ~RF_ALIGNMENT_MASK) | + rman_make_alignment_flags(CBB_MEMALIGN); + break; + case SYS_RES_IOPORT: + if (start < cbb_start_16_io) + start = cbb_start_16_io; + if (end < start) + end = start; + break; + case SYS_RES_IRQ: + tmp = rman_get_start(sc->irq_res); + if (start > tmp || end < tmp || count != 1) { + device_printf(child, "requested interrupt %ld-%ld," + "count = %ld not supported by cbb\n", + start, end, count); + return (NULL); + } + flags |= RF_SHAREABLE; + start = end = rman_get_start(sc->irq_res); + break; + } + res = BUS_ALLOC_RESOURCE(up, child, type, rid, + start, end, count, flags & ~RF_ACTIVE); + if (res == NULL) + return (NULL); + cbb_insert_res(sc, res, type, *rid); + if (flags & RF_ACTIVE) { + if (bus_activate_resource(child, type, *rid, res) != 0) { + bus_release_resource(child, type, *rid, res); + return (NULL); + } + } + + return (res); +} + +static int +exca_release_resource(struct exca_softc *sc, device_t child, int type, + int rid, struct resource *res) +{ + int error; + + if (rman_get_flags(res) & RF_ACTIVE) { + error = bus_deactivate_resource(child, type, rid, res); + if (error != 0) + return (error); + } + cbb_remove_res(sc, res); + return (BUS_RELEASE_RESOURCE(device_get_parent(brdev), child, + type, rid, res)); +} +#endif + static int exca_modevent(module_t mod, int cmd, void *arg) { ==== //depot/projects/netperf_socket/sys/dev/exca/excavar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/exca/excavar.h,v 1.5 2003/06/07 20:46:39 imp Exp $ */ +/* $FreeBSD: src/sys/dev/exca/excavar.h,v 1.6 2004/08/15 23:17:54 imp Exp $ */ /* * Copyright (c) 2002 M Warner Losh. All rights reserved. @@ -77,8 +77,7 @@ #define EXCA_SOCKET_PRESENT 0x00000001 #define EXCA_HAS_MEMREG_WIN 0x00000002 #define EXCA_CARD_OK 0x00000004 -#define EXCA_KTHREAD_RUNNING 0x00000008 -#define EXCA_KTHREAD_DONE 0x00000010 +#define EXCA_EVENT 0x80000000 uint32_t offset; int chipset; #define EXCA_CARDBUS 0 @@ -99,10 +98,8 @@ #define EXCA_BOGUS -1 /* Invalid/not present/etc */ exca_getb_fn *getb; exca_putb_fn *putb; - struct proc *event_thread; - struct mtx mtx; - struct cv cv; device_t pccarddev; + uint32_t status; /* status, hw dependent */ }; void exca_init(struct exca_softc *sc, device_t dev, ==== //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#8 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.282 2004/07/17 10:05:56 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.283 2004/08/14 21:40:28 phk Exp $"); #include "opt_fdc.h" @@ -253,10 +253,6 @@ static void fdc_reset(fdc_p); static int fd_in(struct fdc_data *, int *); static int out_fdc(struct fdc_data *, int); -/* - * The open function is named fdopen() to avoid confusion with fdopen() - * in fd(4). The difference is now only meaningful for debuggers. - */ static d_open_t fdopen; static d_close_t fdclose; static d_strategy_t fdstrategy; ==== //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#5 (text+ko) ==== @@ -25,11 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: if_hme_pci.c,v 1.7 2001/10/05 17:49:43 thorpej Exp + * from: NetBSD: if_hme_pci.c,v 1.14 2004/03/17 08:58:23 martin Exp */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.14 2004/08/12 20:37:02 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.15 2004/08/14 22:38:20 marius Exp $"); /* * PCI front-end device driver for the HME ethernet device. @@ -44,8 +44,10 @@ #include #include +#if defined(__powerpc__) || defined(__sparc64__) #include #include +#endif #include #include @@ -116,12 +118,16 @@ MODULE_DEPEND(hme, pci, 1, 1, 1); MODULE_DEPEND(hme, ether, 1, 1, 1); +#define PCI_VENDOR_SUN 0x108e +#define PCI_PRODUCT_SUN_EBUS 0x1000 +#define PCI_PRODUCT_SUN_HMENETWORK 0x1001 + int hme_pci_probe(device_t dev) { - if (pci_get_vendor(dev) == 0x108e && - pci_get_device(dev) == 0x1001) { + if (pci_get_vendor(dev) == PCI_VENDOR_SUN && + pci_get_device(dev) == PCI_PRODUCT_SUN_HMENETWORK) { device_set_desc(dev, "Sun HME 10/100 Ethernet"); return (0); } @@ -134,6 +140,40 @@ struct hme_pci_softc *hsc = device_get_softc(dev); struct hme_softc *sc = &hsc->hsc_hme; int error = 0; +#if !(defined(__powerpc__) || defined(__sparc64__)) + device_t *children, ebus_dev; + struct resource *ebus_rres; + bus_space_handle_t romh; + bus_space_tag_t romt; + int dataoff, ebus_rrid, slot, vpdoff; + int i, nchildren; + uint8_t buf[32]; + static const uint8_t promhdr[] = { 0x55, 0xaa }; +#define PROMHDR_PTR_DATA 0x18 + static const uint8_t promdat[] = { + 0x50, 0x43, 0x49, 0x52, /* "PCIR" */ + PCI_VENDOR_SUN & 0xff, PCI_VENDOR_SUN >> 8, + PCI_PRODUCT_SUN_HMENETWORK & 0xff, + PCI_PRODUCT_SUN_HMENETWORK >> 8 + }; +#define PROMDATA_PTR_VPD 0x08 +#define PROMDATA_DATA2 0x0a + static const uint8_t promdat2[] = { + 0x18, 0x00, /* structure length */ + 0x00, /* structure revision */ + 0x00, /* interface revision */ + PCIS_NETWORK_ETHERNET, /* subclass code */ + PCIC_NETWORK /* class code */ + }; +#define PCI_VPDRES_ISLARGE(x) ((x) & 0x80) +#define PCI_VPDRES_LARGE_NAME(x) ((x) & 0x7f) +#define PCI_VPDRES_TYPE_VPD 0x10 /* large */ + struct pci_vpd { + uint8_t vpd_key0; + uint8_t vpd_key1; + uint8_t vpd_len; + } *vpd; +#endif pci_enable_busmaster(dev); /* @@ -186,7 +226,116 @@ bus_space_subregion(hsc->hsc_memt, hsc->hsc_memh, 0x7000, 0x1000, &sc->sc_mifh); +#if defined(__powerpc__) || defined(__sparc64__) OF_getetheraddr(dev, sc->sc_arpcom.ac_enaddr); +#else + /* + * Dig out VPD (vital product data) and read NA (network address). + * + * The PCI HME is a PCIO chip, which is composed of two functions: + * function 0: PCI-EBus2 bridge, and + * function 1: HappyMeal Ethernet controller. + * + * The VPD of HME resides in the Boot PROM (PCI FCode) attached + * to the EBus bridge and can't be accessed via the PCI capability + * pointer. + * ``Writing FCode 3.x Programs'' (newer ones, dated 1997 and later) + * chapter 2 describes the data structure. + * + * We don't have a MI EBus driver since no EBus device exists + * (besides the FCode PROM) on add-on HME boards. The ``no driver + * attached'' message for function 0 therefore is what is expected. + */ + + /* Search accompanying EBus bridge. */ + slot = pci_get_slot(dev); + if (device_get_children(device_get_parent(dev), &children, + &nchildren) != 0) { + device_printf(dev, "could not get children\n"); + error = ENXIO; + goto fail_sres; + } + ebus_dev = NULL; + for (i = 0; i < nchildren; i++) { + if (pci_get_class(children[i]) == PCIC_BRIDGE && + pci_get_vendor(children[i]) == PCI_VENDOR_SUN && + pci_get_device(children[i]) == PCI_PRODUCT_SUN_EBUS && + pci_get_slot(children[i]) == slot) { + ebus_dev = children[i]; + break; + } + } + if (ebus_dev == NULL) { + device_printf(dev, "could not find EBus bridge\n"); + error = ENXIO; + goto fail_children; + } + + /* Map EBus bridge PROM registers. */ +#define PCI_EBUS2_BOOTROM 0x10 + ebus_rrid = PCI_EBUS2_BOOTROM; + if ((ebus_rres = bus_alloc_resource_any(ebus_dev, SYS_RES_MEMORY, + &ebus_rrid, RF_ACTIVE)) == NULL) { + device_printf(dev, "could not map PROM registers\n"); + error = ENXIO; + goto fail_children; + } + romt = rman_get_bustag(ebus_rres); + romh = rman_get_bushandle(ebus_rres); + + /* Read PCI expansion PROM header. */ + bus_space_read_region_1(romt, romh, 0, buf, sizeof(buf)); + if (memcmp(buf, promhdr, sizeof(promhdr)) != 0 || + (dataoff = (buf[PROMHDR_PTR_DATA] | + (buf[PROMHDR_PTR_DATA + 1] << 8))) < 0x1c) { + device_printf(dev, "unexpected PCI expansion PROM header\n"); + error = ENXIO; + goto fail_rres; + } + + /* Read PCI expansion PROM data. */ + bus_space_read_region_1(romt, romh, dataoff, buf, sizeof(buf)); + if (memcmp(buf, promdat, sizeof(promdat)) != 0 || + memcmp(buf + PROMDATA_DATA2, promdat2, sizeof(promdat2)) != 0 || + (vpdoff = (buf[PROMDATA_PTR_VPD] | + (buf[PROMDATA_PTR_VPD + 1] << 8))) < 0x1c) { + device_printf(dev, "unexpected PCI expansion PROM data\n"); + error = ENXIO; + goto fail_rres; + } + + /* + * Read PCI VPD. + * The VPD of HME is not in PCI 2.2 standard format. The length in + * the resource header is in big endian, and resources are not + * properly terminated (only one resource and no end tag). + */ + bus_space_read_region_1(romt, romh, vpdoff, buf, sizeof(buf)); + vpd = (void *)(buf + 3); + if (PCI_VPDRES_ISLARGE(buf[0]) == 0 || + PCI_VPDRES_LARGE_NAME(buf[0]) != PCI_VPDRES_TYPE_VPD || + /* buf[1] != 0 || buf[2] != 9 || */ /*len*/ + vpd->vpd_key0 != 0x4e /* N */ || + vpd->vpd_key1 != 0x41 /* A */ || + vpd->vpd_len != ETHER_ADDR_LEN) { + device_printf(dev, "unexpected PCI VPD\n"); + error = ENXIO; + goto fail_rres; + } + if (buf + 6 == NULL) { + device_printf(dev, "could not read network address\n"); + error = ENXIO; + goto fail_rres; + } + bcopy(buf + 6, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); + +fail_rres: + bus_release_resource(ebus_dev, SYS_RES_MEMORY, ebus_rrid, ebus_rres); +fail_children: + free(children, M_TEMP); + if (error != 0) + goto fail_sres; +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 16 04:48:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E76616A4D0; Mon, 16 Aug 2004 04:48:53 +0000 (GMT) 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 BEDFB16A4CE for ; Mon, 16 Aug 2004 04:48:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A029943D2D for ; Mon, 16 Aug 2004 04:48:52 +0000 (GMT) (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.11/8.12.11) with ESMTP id i7G4mq6k048547 for ; Mon, 16 Aug 2004 04:48:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7G4mqXN048544 for perforce@freebsd.org; Mon, 16 Aug 2004 04:48:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Aug 2004 04:48:52 GMT Message-Id: <200408160448.i7G4mqXN048544@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 59784 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, 16 Aug 2004 04:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=59784 Change 59784 by rwatson@rwatson_tislabs on 2004/08/16 04:48:47 Integrate netperf_socket: - Fixes to kqueue locking. - Loop back of UNP_LOCK() around "unp = sotounpcb(so)" in UNIX domain sockets. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#24 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#21 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_descrip.c#17 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.242 2004/08/15 06:24:40 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.243 2004/08/16 03:09:01 green Exp $"); #include "opt_compat.h" @@ -684,7 +684,6 @@ fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; if (new > fdp->fd_lastfile) fdp->fd_lastfile = new; - FILEDESC_UNLOCK(fdp); *retval = new; /* @@ -695,7 +694,8 @@ * XXX this duplicates parts of close(). */ if (delfp != NULL) { - /* XXX need to call knote_fdclose() */ + knote_fdclose(td, new); + FILEDESC_UNLOCK(fdp); mtx_lock(&Giant); (void) closef(delfp, td); mtx_unlock(&Giant); @@ -709,6 +709,8 @@ } FILEDESC_UNLOCK(fdp); } + } else { + FILEDESC_UNLOCK(fdp); } return (0); } ==== //depot/projects/netperf_socket/sys/kern/kern_event.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.78 2004/08/15 06:27:49 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.79 2004/08/16 03:08:38 green Exp $"); #include #include @@ -1050,7 +1050,7 @@ { struct kevent *kevp; struct timeval atv, rtv, ttv; - struct knote *kn, marker; + struct knote *kn, *marker; int count, timeout, nkev, error; int haskqglobal; @@ -1058,7 +1058,6 @@ nkev = 0; error = 0; haskqglobal = 0; - marker.kn_status = KN_MARKER; if (maxevents == 0) goto done_nl; @@ -1081,6 +1080,12 @@ atv.tv_usec = 0; timeout = 0; } + marker = knote_alloc(1); + if (marker == NULL) { + error = ENOMEM; + goto done_nl; + } + marker->kn_status = KN_MARKER; KQ_LOCK(kq); goto start; @@ -1115,12 +1120,12 @@ goto done; } - TAILQ_INSERT_TAIL(&kq->kq_head, &marker, kn_tqe); + TAILQ_INSERT_TAIL(&kq->kq_head, marker, kn_tqe); while (count) { KQ_OWNED(kq); kn = TAILQ_FIRST(&kq->kq_head); - if ((kn->kn_status == KN_MARKER && kn != &marker) || + if ((kn->kn_status == KN_MARKER && kn != marker) || (kn->kn_status & KN_INFLUX) == KN_INFLUX) { kq->kq_state |= KQ_FLUXWAIT; error = msleep(kq, &kq->kq_lock, PSOCK, @@ -1134,7 +1139,7 @@ kq->kq_count--; continue; } - if (kn == &marker) { + if (kn == marker) { KQ_FLUX_WAKEUP(kq); if (count == maxevents) goto retry; @@ -1200,11 +1205,12 @@ break; } } - TAILQ_REMOVE(&kq->kq_head, &marker, kn_tqe); + TAILQ_REMOVE(&kq->kq_head, marker, kn_tqe); done: KQ_OWNED(kq); KQ_UNLOCK_FLUX(kq); KQ_GLOBAL_UNLOCK(&kq_global, haskqglobal); + knote_free(marker); done_nl: KQ_NOTOWNED(kq); if (nkev != 0) ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.137 2004/08/16 01:52:04 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.138 2004/08/16 04:41:03 rwatson Exp $"); #include "opt_mac.h" @@ -128,11 +128,14 @@ static int uipc_abort(struct socket *so) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - UNP_LOCK(); + } unp_drop(unp, ECONNABORTED); unp_detach(unp); /* NB: unlocks */ SOCK_LOCK(so); @@ -143,12 +146,9 @@ static int uipc_accept(struct socket *so, struct sockaddr **nam) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; const struct sockaddr *sa; - if (unp == NULL) - return (EINVAL); - /* * Pass back name of connected socket, * if it was bound and we are still connected @@ -156,6 +156,13 @@ */ *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + free(*nam, M_SONAME); + *nam = NULL; + return (EINVAL); + } if (unp->unp_conn != NULL && unp->unp_conn->unp_addr != NULL) sa = (struct sockaddr *) unp->unp_conn->unp_addr; else @@ -178,12 +185,18 @@ static int uipc_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; + int error; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - - return (unp_bind(unp, nam, td)); + } + error = unp_bind(unp, nam, td); + UNP_UNLOCK(); + return (error); } static int @@ -197,11 +210,10 @@ UNP_LOCK(); unp = sotounpcb(so); if (unp == NULL) { - error = EINVAL; - goto out; + UNP_UNLOCK(); + return (EINVAL); } error = unp_connect(so, nam, td); -out: UNP_UNLOCK(); return (error); } @@ -209,13 +221,15 @@ int uipc_connect2(struct socket *so1, struct socket *so2) { - struct unpcb *unp = sotounpcb(so1); + struct unpcb *unp; int error; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so1); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - - UNP_LOCK(); + } error = unp_connect2(so1, so2); UNP_UNLOCK(); return (error); @@ -226,12 +240,14 @@ static int uipc_detach(struct socket *so) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - - UNP_LOCK(); + } unp_detach(unp); /* NB: unlocks unp */ return (0); } @@ -239,11 +255,14 @@ static int uipc_disconnect(struct socket *so) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - UNP_LOCK(); + } unp_disconnect(unp); UNP_UNLOCK(); return (0); @@ -252,12 +271,15 @@ static int uipc_listen(struct socket *so, struct thread *td) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; int error; - if (unp == NULL || unp->unp_vnode == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL || unp->unp_vnode == NULL) { + UNP_UNLOCK(); return (EINVAL); - UNP_LOCK(); + } error = unp_listen(unp, td); UNP_UNLOCK(); return (error); @@ -266,13 +288,18 @@ static int uipc_peeraddr(struct socket *so, struct sockaddr **nam) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; const struct sockaddr *sa; - if (unp == NULL) - return (EINVAL); *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + free(*nam, M_SONAME); + *nam = NULL; + return (EINVAL); + } if (unp->unp_conn != NULL && unp->unp_conn->unp_addr!= NULL) sa = (struct sockaddr *) unp->unp_conn->unp_addr; else { @@ -291,12 +318,10 @@ static int uipc_rcvd(struct socket *so, int flags) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; struct socket *so2; u_long newhiwat; - if (unp == NULL) - return (EINVAL); /* * Reorder locks to avoid LORs. Note that we * delay re-locking so_rcv to below so it can @@ -304,6 +329,12 @@ */ SOCKBUF_UNLOCK(&so>so_rcv); UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + return (EINVAL); + } + UNP_LOCK(); switch (so->so_type) { case SOCK_DGRAM: panic("uipc_rcvd DGRAM?"); @@ -346,10 +377,11 @@ struct mbuf *control, struct thread *td) { int error = 0; - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; struct socket *so2; u_long newhiwat; + unp = sotounpcb(so); if (unp == NULL) { error = EINVAL; goto release; @@ -367,6 +399,12 @@ */ SOCKBUF_UNLOCK(&so->so_snd); UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + error = EINVAL; + goto dispose_release; + } SOCKBUF_LOCK(&so->so_snd); switch (so->so_type) { @@ -474,6 +512,7 @@ } UNP_UNLOCK(); +dispose_release: if (control != NULL && error != 0) unp_dispose(control); @@ -488,12 +527,15 @@ static int uipc_sense(struct socket *so, struct stat *sb) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; struct socket *so2; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - UNP_LOCK(); + } sb->st_blksize = so->so_snd.sb_hiwat; if (so->so_type == SOCK_STREAM && unp->unp_conn != NULL) { so2 = unp->unp_conn->unp_socket; @@ -510,11 +552,14 @@ static int uipc_shutdown(struct socket *so) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; - if (unp == NULL) + UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); return (EINVAL); - UNP_LOCK(); + } /* XXX socket lock? */ socantsendmore(so); unp_shutdown(unp); @@ -525,13 +570,18 @@ static int uipc_sockaddr(struct socket *so, struct sockaddr **nam) { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; const struct sockaddr *sa; - if (unp == NULL) - return (EINVAL); *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + free(*nam, M_SONAME); + *nam = NULL; + return (EINVAL); + } if (unp->unp_addr != NULL) sa = (struct sockaddr *) unp->unp_addr; else @@ -554,7 +604,7 @@ struct socket *so; struct sockopt *sopt; { - struct unpcb *unp = sotounpcb(so); + struct unpcb *unp; struct xucred xu; int error; @@ -564,6 +614,12 @@ case LOCAL_PEERCRED: error = 0; UNP_LOCK(); + unp = sotounpcb(so); + if (unp == NULL) { + UNP_UNLOCK(); + error = EINVAL; + break; + } if (unp->unp_flags & UNP_HAVEPC) xu = unp->unp_peercred; else { @@ -656,9 +712,9 @@ unp_count++; LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead : &unp_shead, unp, unp_link); + so->so_pcb = unp; UNP_UNLOCK(); - so->so_pcb = unp; return (0); } @@ -725,6 +781,8 @@ struct nameidata nd; char *buf; + UNP_LOCK_ASSERT(); + /* * XXXRW: This test-and-set of unp_vnode is non-atomic; the * unlocked read here is fine, but the value of unp_vnode needs @@ -738,6 +796,8 @@ if (namelen <= 0) return (EINVAL); + UNP_UNLOCK(); + buf = malloc(namelen + 1, M_TEMP, M_WAITOK); strlcpy(buf, soun->sun_path, namelen + 1); @@ -795,6 +855,7 @@ done: mtx_unlock(&Giant); free(buf, M_TEMP); + UNP_LOCK(); return (error); } ==== //depot/projects/netperf_socket/sys/vm/vm_map.c#21 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.358 2004/08/14 18:57:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.359 2004/08/16 03:11:09 green Exp $"); #include #include @@ -2236,8 +2236,12 @@ /* * Wait for wiring or unwiring of an entry to complete. + * Also wait for any system wirings to disappear on + * user maps. */ - if ((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0) { + if ((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0 || + (vm_map_pmap(map) != kernel_pmap && + vm_map_entry_system_wired_count(entry) != 0)) { unsigned int last_timestamp; vm_offset_t saved_start; vm_map_entry_t tmp_entry; From owner-p4-projects@FreeBSD.ORG Mon Aug 16 14:51:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 706AA16A4D0; Mon, 16 Aug 2004 14:51:35 +0000 (GMT) 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 4044F16A4CE for ; Mon, 16 Aug 2004 14:51:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E8A843D39 for ; Mon, 16 Aug 2004 14:51:35 +0000 (GMT) (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.11/8.12.11) with ESMTP id i7GEpZPl099482 for ; Mon, 16 Aug 2004 14:51:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GEpYpZ099476 for perforce@freebsd.org; Mon, 16 Aug 2004 14:51:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Aug 2004 14:51:34 GMT Message-Id: <200408161451.i7GEpYpZ099476@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 59852 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, 16 Aug 2004 14:51:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=59852 Change 59852 by rwatson@rwatson_paprika on 2004/08/16 14:51:23 Integrate netperf_socket from FreeBSD CVS: More linux32 fixage. IA32 -> COMPAT_IA32. geom_raid3. powerpc /dev/mem. amd64 agp support. VM_KMEM_SIZE_MAX tweakage. ipfw2 ABI broken again. debug_mpsafevm to do-Giant some interesting VM pieces. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/linux/linux.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/netperf_socket/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#36 integrate .. //depot/projects/netperf_socket/sys/conf/files#47 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#15 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#27 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#15 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#7 integrate .. //depot/projects/netperf_socket/sys/conf/options#25 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#6 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#5 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#25 integrate .. //depot/projects/netperf_socket/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux.h#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#17 integrate .. //depot/projects/netperf_socket/sys/modules/agp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#9 integrate .. //depot/projects/netperf_socket/sys/modules/geom/geom_raid3/Makefile#1 branch .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#8 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd64.c#1 branch .. //depot/projects/netperf_socket/sys/pci/agp_sis.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_via.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/agpreg.h#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/memdev.h#1 branch .. //depot/projects/netperf_socket/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/mem.c#1 branch .. //depot/projects/netperf_socket/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#22 integrate .. //depot/projects/netperf_socket/sys/vm/vm_meter.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/linux/linux.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.58 2003/04/16 20:04:47 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.59 2004/08/16 07:05:44 tjr Exp $ */ #ifndef _ALPHA_LINUX_LINUX_H_ @@ -45,6 +45,9 @@ MALLOC_DECLARE(M_LINUX); #endif +#define PTRIN(v) (void *)(v) +#define PTROUT(v) (l_uintptr_t)(v) + typedef int l_int; typedef int64_t l_long; typedef int64_t l_longlong; @@ -55,6 +58,7 @@ typedef unsigned short l_ushort; typedef char *l_caddr_t; +typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; typedef l_uint l_dev_t; ==== //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#5 (text+ko) ==== @@ -27,11 +27,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.119 2004/05/24 12:42:16 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.120 2004/08/16 12:51:32 obrien Exp $ */ #include "opt_atpic.h" -#include "opt_ia32.h" +#include "opt_compat.h" #include #include @@ -307,7 +307,7 @@ * included. */ -#ifdef IA32 +#ifdef COMPAT_IA32 .data .p2align 4 .text ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#14 (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.419 2004/08/03 19:24:52 markm Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.420 2004/08/16 12:51:32 obrien Exp $ machine amd64 cpu HAMMER @@ -44,7 +44,7 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options IA32 # Compatible with i386 binaries +options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support ==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.15 2004/08/01 11:40:51 markm Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $ # # @@ -456,6 +456,9 @@ #XXX keep these here for now and reactivate when support for emulating #XXX these 32 bit binaries is added. +# Enable 32-bit runtime support for FreeBSD/i386 binaries. +options COMPAT_IA32 + # Enable iBCS2 runtime support for SCO and ISC binaries #XXX#options IBCS2 @@ -465,9 +468,12 @@ # Enable Linux ABI emulation #XXX#options COMPAT_LINUX -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX +# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and IA32) +options COMPAT_LINUX32 + +# Enable the linux-like proc filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -#XXX#options LINPROCFS +options LINPROCFS # # SysVR4 ABI emulation ==== //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.83 2004/04/01 00:04:22 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.84 2004/08/16 08:19:18 tjr Exp $"); #include #include @@ -86,12 +86,17 @@ extern int ncpus; #endif /* __alpha__ */ -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) #include #include -#endif /* __i386__ */ +#endif /* __i386__ || __amd64__ */ +#include "opt_compat.h" +#if !COMPAT_LINUX32 /* XXX */ #include +#else +#include +#endif #include #include #include @@ -251,9 +256,9 @@ } #endif /* __alpha__ */ -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) /* - * Filler function for proc/cpuinfo (i386 version) + * Filler function for proc/cpuinfo (i386 & amd64 version) */ static int linprocfs_docpuinfo(PFS_FILL_ARGS) @@ -276,6 +281,7 @@ }; switch (cpu_class) { +#ifdef __i386__ case CPUCLASS_286: class = 2; break; @@ -294,6 +300,11 @@ default: class = 0; break; +#else + default: + class = 6; + break; +#endif } for (i = 0; i < mp_ncpus; ++i) { @@ -331,7 +342,7 @@ return (0); } -#endif /* __i386__ */ +#endif /* __i386__ || __amd64__ */ /* * Filler function for proc/mtab ==== //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.86 2004/07/27 21:38:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.87 2004/08/16 07:28:16 tjr Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -54,8 +54,15 @@ #include #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include +#else +#include +#include +#endif #include #ifndef __alpha__ @@ -827,7 +834,11 @@ l_off_t l_start; l_off_t l_len; l_pid_t l_pid; -}; +} +#if __amd64__ && COMPAT_LINUX32 +__packed +#endif +; static void linux_to_bsd_flock(struct l_flock *linux_flock, struct flock *bsd_flock) @@ -872,14 +883,18 @@ linux_flock->l_pid = (l_pid_t)bsd_flock->l_pid; } -#if defined(__i386__) +#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) struct l_flock64 { l_short l_type; l_short l_whence; l_loff_t l_start; l_loff_t l_len; l_pid_t l_pid; -}; +} +#if __amd64__ && COMPAT_LINUX32 +__packed +#endif +; static void linux_to_bsd_flock64(struct l_flock64 *linux_flock, struct flock *bsd_flock) @@ -923,7 +938,7 @@ linux_flock->l_len = (l_loff_t)bsd_flock->l_len; linux_flock->l_pid = (l_pid_t)bsd_flock->l_pid; } -#endif /* __i386__ */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ #if defined(__alpha__) #define linux_fcntl64_args linux_fcntl_args @@ -1051,7 +1066,7 @@ return (fcntl_common(td, &args64)); } -#if defined(__i386__) +#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) int linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) { @@ -1099,7 +1114,7 @@ return (fcntl_common(td, args)); } -#endif /* __i386__ */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ int linux_chown(struct thread *td, struct linux_chown_args *args) ==== //depot/projects/netperf_socket/sys/compat/linux/linux_getcwd.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.14 2003/11/17 18:57:20 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.15 2004/08/16 07:28:16 tjr Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -59,8 +59,15 @@ #include #include /* XXX only for DIRBLKSIZ */ +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include +#else +#include +#include +#endif #include static int ==== //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.120 2004/07/02 15:31:44 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.121 2004/08/16 07:28:16 tjr Exp $"); #include #include @@ -56,8 +56,15 @@ #include #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include +#else +#include +#include +#endif #include #include @@ -2081,7 +2088,11 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { +#if COMPAT_LINUX32 + struct l_ifconf ifc; +#else struct ifconf ifc; +#endif struct l_ifreq ifr; struct ifnet *ifp; struct ifaddr *ifa; @@ -2094,7 +2105,7 @@ return (error); /* handle the 'request buffer size' case */ - if (ifc.ifc_buf == NULL) { + if (ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; TAILQ_FOREACH(ifp, &ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { @@ -2108,7 +2119,7 @@ } /* much easier to use uiomove than keep track ourselves */ - iov.iov_base = ifc.ifc_buf; + iov.iov_base = PTRIN(ifc.ifc_buf); iov.iov_len = ifc.ifc_len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; ==== //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.38 2003/11/05 01:53:10 fjoe Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.39 2004/08/16 07:28:16 tjr Exp $"); #include #include @@ -39,9 +39,17 @@ #include #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include #include +#else +#include +#include +#include +#endif #include #include @@ -133,8 +141,8 @@ struct l_msqid_ds { struct l_ipc_perm msg_perm; - struct l_msg *msg_first; /* first message on queue,unused */ - struct l_msg *msg_last; /* last message in queue,unused */ + l_uintptr_t msg_first; /* first message on queue,unused */ + l_uintptr_t msg_last; /* last message in queue,unused */ l_time_t msg_stime; /* last msgsnd time */ l_time_t msg_rtime; /* last msgrcv time */ l_time_t msg_ctime; /* last change time */ @@ -145,18 +153,26 @@ l_ushort msg_qbytes; /* max number of bytes on queue */ l_pid_t msg_lspid; /* pid of last msgsnd */ l_pid_t msg_lrpid; /* last receive pid */ -}; +} +#if __amd64__ && COMPAT_LINUX32 +__packed +#endif +; struct l_semid_ds { struct l_ipc_perm sem_perm; l_time_t sem_otime; l_time_t sem_ctime; - void *sem_base; - void *sem_pending; - void *sem_pending_last; - void *undo; + l_uintptr_t sem_base; + l_uintptr_t sem_pending; + l_uintptr_t sem_pending_last; + l_uintptr_t undo; l_ushort sem_nsems; -}; +} +#if __amd64__ && COMPAT_LINUX32 +__packed +#endif +; struct l_shmid_ds { struct l_ipc_perm shm_perm; @@ -168,8 +184,8 @@ l_ushort shm_lpid; l_short shm_nattch; l_ushort private1; - void *private2; - void *private3; + l_uintptr_t private2; + l_uintptr_t private3; }; static void @@ -179,7 +195,7 @@ bsp->sem_otime = lsp->sem_otime; bsp->sem_ctime = lsp->sem_ctime; bsp->sem_nsems = lsp->sem_nsems; - bsp->sem_base = lsp->sem_base; + bsp->sem_base = PTRIN(lsp->sem_base); } static void @@ -189,7 +205,7 @@ lsp->sem_otime = bsp->sem_otime; lsp->sem_ctime = bsp->sem_ctime; lsp->sem_nsems = bsp->sem_nsems; - lsp->sem_base = bsp->sem_base; + lsp->sem_base = PTROUT(bsp->sem_base); } static void @@ -203,7 +219,8 @@ bsp->shm_atime = lsp->shm_atime; bsp->shm_dtime = lsp->shm_dtime; bsp->shm_ctime = lsp->shm_ctime; - bsp->shm_internal = lsp->private3; /* this goes (yet) SOS */ + /* this goes (yet) SOS */ + bsp->shm_internal = PTRIN(lsp->private3); } static void @@ -217,7 +234,8 @@ lsp->shm_atime = bsp->shm_atime; lsp->shm_dtime = bsp->shm_dtime; lsp->shm_ctime = bsp->shm_ctime; - lsp->private3 = bsp->shm_internal; /* this goes (yet) SOS */ + /* this goes (yet) SOS */ + lsp->private3 = PTROUT(bsp->shm_internal); } static void @@ -447,7 +465,7 @@ } */ bsd_args; bsd_args.semid = args->semid; - bsd_args.sops = (struct sembuf *)args->tsops; + bsd_args.sops = (struct sembuf *)PTRIN(args->tsops); bsd_args.nsops = args->nsops; return semop(td, &bsd_args); } @@ -516,7 +534,7 @@ case LINUX_IPC_SET: bsd_args.cmd = IPC_SET; error = linux_semid_pullup(args->cmd & LINUX_IPC_64, - &linux_semid, (caddr_t)args->arg.buf); + &linux_semid, (caddr_t)PTRIN(args->arg.buf)); if (error) return (error); unptr->buf = stackgap_alloc(&sg, sizeof(struct semid_ds)); @@ -536,7 +554,7 @@ unptr->buf->sem_perm); bsd_to_linux_semid_ds(unptr->buf, &linux_semid); return (linux_semid_pushdown(args->cmd & LINUX_IPC_64, - &linux_semid, (caddr_t)args->arg.buf)); + &linux_semid, (caddr_t)PTRIN(args->arg.buf))); case LINUX_IPC_INFO: case LINUX_SEM_INFO: bcopy(&seminfo, &linux_seminfo, sizeof(linux_seminfo) ); @@ -546,8 +564,8 @@ linux_seminfo.semusz = used_semids; linux_seminfo.semaem = used_sems; */ - error = copyout(&linux_seminfo, args->arg.buf, - sizeof(linux_seminfo)); + error = copyout(&linux_seminfo, + PTRIN(args->arg.buf), sizeof(linux_seminfo)); if (error) return error; td->td_retval[0] = seminfo.semmni; @@ -575,7 +593,7 @@ } */ bsd_args; bsd_args.msqid = args->msqid; - bsd_args.msgp = args->msgp; + bsd_args.msgp = PTRIN(args->msgp); bsd_args.msgsz = args->msgsz; bsd_args.msgflg = args->msgflg; return msgsnd(td, &bsd_args); @@ -593,7 +611,7 @@ } */ bsd_args; bsd_args.msqid = args->msqid; - bsd_args.msgp = args->msgp; + bsd_args.msgp = PTRIN(args->msgp); bsd_args.msgsz = args->msgsz; bsd_args.msgtyp = args->msgtyp; bsd_args.msgflg = args->msgflg; @@ -626,7 +644,7 @@ caddr_t sg = stackgap_init(); error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, - &linux_msqid, (caddr_t)args->buf); + &linux_msqid, (caddr_t)PTRIN(args->buf)); if (error != 0) return (error); bsd_args.buf = (struct msqid_ds*)stackgap_alloc(&sg, @@ -644,7 +662,7 @@ if (bsd_args.cmd == LINUX_IPC_STAT) { bsd_to_linux_msqid_ds(bsd_args.buf, &linux_msqid); return (linux_msqid_pushdown(args->cmd & LINUX_IPC_64, - &linux_msqid, (caddr_t)args->buf)); + &linux_msqid, (caddr_t)PTRIN(args->buf))); } return (0); @@ -659,14 +677,18 @@ int shmflg; } */ bsd_args; int error; +#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) + l_uintptr_t addr; +#endif bsd_args.shmid = args->shmid; - bsd_args.shmaddr = args->shmaddr; + bsd_args.shmaddr = PTRIN(args->shmaddr); bsd_args.shmflg = args->shmflg; if ((error = shmat(td, &bsd_args))) return error; -#ifdef __i386__ - if ((error = copyout(td->td_retval, args->raddr, sizeof(l_ulong)))) +#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) + addr = td->td_retval[0]; + if ((error = copyout(&addr, PTRIN(args->raddr), sizeof(addr)))) return error; td->td_retval[0] = 0; #endif @@ -680,7 +702,7 @@ void *shmaddr; } */ bsd_args; - bsd_args.shmaddr = args->shmaddr; + bsd_args.shmaddr = PTRIN(args->shmaddr); return shmdt(td, &bsd_args); } @@ -723,7 +745,7 @@ bsd_to_linux_shminfo(&bsd_shminfo, &linux_shminfo); return (linux_shminfo_pushdown(args->cmd & LINUX_IPC_64, - &linux_shminfo, (caddr_t)args->buf)); + &linux_shminfo, (caddr_t)PTRIN(args->buf))); } case LINUX_SHM_INFO: { @@ -737,7 +759,7 @@ bsd_to_linux_shm_info(&bsd_shm_info, &linux_shm_info); - return copyout(&linux_shm_info, (caddr_t)args->buf, + return copyout(&linux_shm_info, (caddr_t)PTRIN(args->buf), sizeof(struct l_shm_info)); } @@ -751,7 +773,7 @@ bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)args->buf)); + &linux_shmid, (caddr_t)PTRIN(args->buf))); case LINUX_SHM_STAT: /* Perform shmctl wanting removed segments lookup */ @@ -763,11 +785,11 @@ bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)args->buf)); + &linux_shmid, (caddr_t)PTRIN(args->buf))); case LINUX_IPC_SET: error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)args->buf); + &linux_shmid, (caddr_t)PTRIN(args->buf)); if (error) return error; @@ -780,11 +802,11 @@ case LINUX_IPC_RMID: { void *buf; - if (args->buf == NULL) + if (args->buf == 0) buf = NULL; else { error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)args->buf); + &linux_shmid, (caddr_t)PTRIN(args->buf)); if (error) return error; linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); ==== //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ipc.h,v 1.9 2002/10/11 11:43:08 sobomax Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ipc.h,v 1.10 2004/08/16 07:28:16 tjr Exp $ */ #ifndef _LINUX_IPC_H_ @@ -40,7 +40,7 @@ #define LINUX_IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger message sizes, etc. */ -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) struct linux_msgctl_args { @@ -135,6 +135,6 @@ int linux_shmdt(struct thread *, struct linux_shmdt_args *); int linux_shmget(struct thread *, struct linux_shmget_args *); -#endif /* __i386__ */ +#endif /* __i386__ || __amd64__ */ #endif /* _LINUX_IPC_H_ */ ==== //depot/projects/netperf_socket/sys/compat/linux/linux_mib.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.21 2003/06/10 21:27:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.22 2004/08/16 07:28:16 tjr Exp $"); #include #include @@ -39,7 +39,13 @@ #include #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include +#else +#include +#endif #include struct linux_prison { ==== //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,14 +28,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.157 2004/08/15 12:34:15 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.160 2004/08/16 11:12:57 obrien Exp $"); #include "opt_mac.h" #include #include #include +#if defined(__i386__) || defined(__alpha__) #include +#endif #include #include #include @@ -70,8 +72,15 @@ #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include +#else +#include +#include +#endif #include #include @@ -224,7 +233,7 @@ #ifdef DEBUG if (ldebug(brk)) - printf(ARGS(brk, "%p"), (void *)args->dsend); + printf(ARGS(brk, "%p"), (void *)(uintptr_t)args->dsend); #endif old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize); new = (vm_offset_t)args->dsend; @@ -237,6 +246,8 @@ return 0; } +#if defined(__i386__) || defined(__alpha__) + int linux_uselib(struct thread *td, struct linux_uselib_args *args) { @@ -427,7 +438,7 @@ goto cleanup; /* copy from kernel VM space to user space */ - error = copyout((void *)(uintptr_t)(buffer + file_offset), + error = copyout(PTRIN(buffer + file_offset), (void *)vmaddr, a_out->a_text + a_out->a_data); /* release temporary kernel space */ @@ -485,6 +496,8 @@ return error; } +#endif /* __i386__ || __alpha__ */ + int linux_select(struct thread *td, struct linux_select_args *args) { @@ -596,7 +609,7 @@ #ifdef DEBUG if (ldebug(mremap)) printf(ARGS(mremap, "%p, %08lx, %08lx, %08lx"), - (void *)args->addr, + (void *)(uintptr_t)args->addr, (unsigned long)args->old_len, (unsigned long)args->new_len, (unsigned long)args->flags); @@ -610,7 +623,8 @@ } if (args->new_len < args->old_len) { - bsd_args.addr = (caddr_t)(args->addr + args->new_len); + bsd_args.addr = + (caddr_t)((uintptr_t)args->addr + args->new_len); bsd_args.len = args->old_len - args->new_len; error = munmap(td, &bsd_args); } @@ -628,8 +642,8 @@ { struct msync_args bsd_args; - bsd_args.addr = (caddr_t)args->addr; - bsd_args.len = args->len; + bsd_args.addr = (caddr_t)(uintptr_t)args->addr; + bsd_args.len = (uintptr_t)args->len; bsd_args.flags = args->fl & ~LINUX_MS_SYNC; return msync(td, &bsd_args); @@ -755,7 +769,7 @@ return (copyout(&utsname, args->buf, sizeof(utsname))); } -#if defined(__i386__) +#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) struct l_utimbuf { l_time_t l_actime; l_time_t l_modtime; @@ -793,7 +807,7 @@ LFREEPATH(fname); return (error); } -#endif /* __i386__ */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ #define __WCLONE 0x80000000 @@ -935,7 +949,7 @@ #ifdef DEBUG if (ldebug(setitimer)) printf(ARGS(setitimer, "%p, %p"), - (void *)args->itv, (void *)args->oitv); + (void *)uap->itv, (void *)uap->oitv); #endif lp = uap->itv; if (lp != NULL) { @@ -993,7 +1007,7 @@ #ifdef DEBUG if (ldebug(getitimer)) - printf(ARGS(getitimer, "%p"), (void *)args->itv); + printf(ARGS(getitimer, "%p"), (void *)uap->itv); #endif lp = uap->itv; if (lp != NULL) { @@ -1179,12 +1193,21 @@ lim_rlimit(p, which, &bsd_rlim); PROC_UNLOCK(p); +#if !COMPAT_LINUX32 rlim.rlim_cur = (unsigned long)bsd_rlim.rlim_cur; if (rlim.rlim_cur == ULONG_MAX) rlim.rlim_cur = LONG_MAX; rlim.rlim_max = (unsigned long)bsd_rlim.rlim_max; if (rlim.rlim_max == ULONG_MAX) rlim.rlim_max = LONG_MAX; +#else + rlim.rlim_cur = (unsigned int)bsd_rlim.rlim_cur; + if (rlim.rlim_cur == UINT_MAX) + rlim.rlim_cur = INT_MAX; + rlim.rlim_max = (unsigned int)bsd_rlim.rlim_max; + if (rlim.rlim_max == UINT_MAX) + rlim.rlim_max = INT_MAX; +#endif return (copyout(&rlim, args->rlim, sizeof(rlim))); } ==== //depot/projects/netperf_socket/sys/compat/linux/linux_signal.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.45 2003/06/10 21:27:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.47 2004/08/16 12:15:07 obrien Exp $"); #include #include @@ -38,8 +38,15 @@ #include #include +#include "opt_compat.h" + +#if !COMPAT_LINUX32 #include #include +#else +#include +#include +#endif #include #include @@ -90,7 +97,7 @@ { linux_to_bsd_sigset(&lsa->lsa_mask, &bsa->sa_mask); - bsa->sa_handler = lsa->lsa_handler; + bsa->sa_handler = PTRIN(lsa->lsa_handler); bsa->sa_flags = 0; if (lsa->lsa_flags & LINUX_SA_NOCLDSTOP) bsa->sa_flags |= SA_NOCLDSTOP; @@ -113,8 +120,12 @@ { bsd_to_linux_sigset(&bsa->sa_mask, &lsa->lsa_mask); +#if COMPAT_LINUX32 + lsa->lsa_handler = (uintptr_t)bsa->sa_handler; +#else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 16 22:24:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4B2A16A4D0; Mon, 16 Aug 2004 22:24:11 +0000 (GMT) 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 C133816A4CE for ; Mon, 16 Aug 2004 22:24:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8D8143D46 for ; Mon, 16 Aug 2004 22:24:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GMOBDa039605 for ; Mon, 16 Aug 2004 22:24:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GMOBMK039602 for perforce@freebsd.org; Mon, 16 Aug 2004 22:24:11 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 22:24:11 GMT Message-Id: <200408162224.i7GMOBMK039602@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 59891 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, 16 Aug 2004 22:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=59891 Change 59891 by peter@peter_daintree on 2004/08/16 22:23:44 temporary hack. remind me to kick somebody for moving this out of /usr/share/mk which remained in sync with the userland compiler. Affected files ... .. //depot/projects/hammer/sys/conf/kern.pre.mk#28 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.pre.mk#28 (text+ko) ==== @@ -70,8 +70,8 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} -CFLAGS+= --param inline-unit-growth=100 -CFLAGS+= --param large-function-growth=1000 +#CFLAGS+= --param inline-unit-growth=100 +#CFLAGS+= --param large-function-growth=1000 WERROR?= -Werror .endif From owner-p4-projects@FreeBSD.ORG Mon Aug 16 22:27:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04D1316A4D0; Mon, 16 Aug 2004 22:27:17 +0000 (GMT) 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 A3DA816A4CE for ; Mon, 16 Aug 2004 22:27:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 821C543D58 for ; Mon, 16 Aug 2004 22:27:16 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GMRG7g039704 for ; Mon, 16 Aug 2004 22:27:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GMRFsU039701 for perforce@freebsd.org; Mon, 16 Aug 2004 22:27:15 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 22:27:15 GMT Message-Id: <200408162227.i7GMRFsU039701@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 59892 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, 16 Aug 2004 22:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=59892 Change 59892 by peter@peter_daintree on 2004/08/16 22:26:15 IFC @59890 Affected files ... .. //depot/projects/hammer/MAINTAINERS#27 integrate .. //depot/projects/hammer/Makefile.inc1#56 integrate .. //depot/projects/hammer/bin/dd/args.c#7 integrate .. //depot/projects/hammer/bin/dd/dd.1#6 integrate .. //depot/projects/hammer/bin/dd/dd.c#6 integrate .. //depot/projects/hammer/bin/dd/dd.h#6 integrate .. //depot/projects/hammer/bin/dd/extern.h#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#6 integrate .. //depot/projects/hammer/contrib/isc-dhcp/README#6 integrate .. //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#6 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#10 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#6 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#3 integrate .. //depot/projects/hammer/contrib/top/commands.c#4 integrate .. //depot/projects/hammer/contrib/top/top.c#5 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#23 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#25 integrate .. //depot/projects/hammer/etc/rc.d/jail#8 integrate .. //depot/projects/hammer/etc/services#11 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#26 integrate .. //depot/projects/hammer/include/Makefile#28 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/_set_tp.c#2 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#15 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#6 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#7 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#8 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#8 integrate .. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/sparc64/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_symbols.c#1 branch .. //depot/projects/hammer/lib/libthr/Makefile#6 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#4 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.c#8 integrate .. //depot/projects/hammer/release/Makefile#51 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#53 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#5 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#4 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#16 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#4 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#1 branch .. //depot/projects/hammer/sbin/savecore/savecore.c#6 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#21 integrate .. //depot/projects/hammer/share/man/man4/de.4#4 integrate .. //depot/projects/hammer/share/man/man4/inet.4#11 integrate .. //depot/projects/hammer/share/man/man4/mpt.4#4 integrate .. //depot/projects/hammer/share/man/man4/rl.4#10 integrate .. //depot/projects/hammer/share/man/man4/rue.4#7 integrate .. //depot/projects/hammer/share/man/man4/trm.4#2 integrate .. //depot/projects/hammer/share/man/man4/vr.4#5 integrate .. //depot/projects/hammer/share/man/man7/hier.7#22 integrate .. //depot/projects/hammer/share/man/man7/release.7#21 integrate .. //depot/projects/hammer/share/man/man9/vslock.9#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#35 integrate .. //depot/projects/hammer/sys/alpha/linux/linux.h#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#31 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#51 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#40 integrate .. //depot/projects/hammer/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/hammer/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/hammer/sys/boot/Makefile#13 integrate .. //depot/projects/hammer/sys/boot/ofw/common/main.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#5 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#22 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.h#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#21 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#14 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#18 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#18 integrate .. //depot/projects/hammer/sys/conf/NOTES#58 integrate .. //depot/projects/hammer/sys/conf/files#74 integrate .. //depot/projects/hammer/sys/conf/files.amd64#53 integrate .. //depot/projects/hammer/sys/conf/files.i386#40 integrate .. //depot/projects/hammer/sys/conf/files.ia64#22 integrate .. //depot/projects/hammer/sys/conf/files.pc98#33 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#11 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#21 integrate .. //depot/projects/hammer/sys/conf/options#50 integrate .. //depot/projects/hammer/sys/conf/options.amd64#30 integrate .. //depot/projects/hammer/sys/conf/options.i386#27 integrate .. //depot/projects/hammer/sys/conf/options.ia64#11 integrate .. //depot/projects/hammer/sys/conf/options.pc98#22 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amrio.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#8 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#9 integrate .. //depot/projects/hammer/sys/dev/exca/excavar.h#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#10 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#10 integrate .. //depot/projects/hammer/sys/dev/ofw/openpromio.c#6 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#18 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/urio.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#49 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#30 integrate .. //depot/projects/hammer/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/hammer/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#3 integrate .. //depot/projects/hammer/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#7 integrate .. //depot/projects/hammer/sys/ia64/include/pcb.h#7 integrate .. //depot/projects/hammer/sys/isa/psm.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#22 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#49 integrate .. //depot/projects/hammer/sys/modules/Makefile#50 integrate .. //depot/projects/hammer/sys/modules/agp/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/cbb/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/geom/geom_raid3/Makefile#1 branch .. //depot/projects/hammer/sys/netinet/icmp_var.h#4 integrate .. //depot/projects/hammer/sys/netinet/if_atm.c#5 integrate .. //depot/projects/hammer/sys/netinet/if_atm.h#2 integrate .. //depot/projects/hammer/sys/netinet/igmp.h#3 integrate .. //depot/projects/hammer/sys/netinet/in.c#9 integrate .. //depot/projects/hammer/sys/netinet/in.h#14 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#19 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#12 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#7 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_id.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.h#5 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_debug.h#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#20 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/hammer/sys/netinet/tcpip.h#3 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#21 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#3 integrate .. //depot/projects/hammer/sys/pci/agp.c#15 integrate .. //depot/projects/hammer/sys/pci/agp_amd.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#1 branch .. //depot/projects/hammer/sys/pci/agp_sis.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#13 integrate .. //depot/projects/hammer/sys/pci/agpreg.h#9 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#18 integrate .. //depot/projects/hammer/sys/powerpc/include/memdev.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/hammer/sys/powerpc/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#4 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/locore.S#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mem.c#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofwmagic.S#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#27 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#30 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#5 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/hammer/sys/vm/vm.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#43 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#9 integrate .. //depot/projects/hammer/tools/regression/geom_raid3/Makefile#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/runtests.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-2.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-3.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-4.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-5.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-6.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-7.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-8.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-9.sh#1 branch .. //depot/projects/hammer/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/ttls3/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/calendar/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.all#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#22 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.hungarian#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek#1 branch .. //depot/projects/hammer/usr.bin/fetch/fetch.c#13 integrate .. //depot/projects/hammer/usr.bin/m4/eval.c#3 integrate .. //depot/projects/hammer/usr.bin/m4/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/m4/main.c#4 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.1#4 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#10 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#7 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#5 integrate .. //depot/projects/hammer/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.c#3 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#11 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#27 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.98 2004/08/05 21:01:27 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $ subsystem login notes ----------------------------- @@ -96,6 +96,7 @@ geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. geom_nop pjd Pre-commit review preferred. +geom_raid3 pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. ==== //depot/projects/hammer/Makefile.inc1#56 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.437 2004/08/11 16:45:20 harti Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.438 2004/08/16 18:17:14 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -62,10 +62,7 @@ .if !defined(NOSHARE) SUBDIR+=share .endif -.if ${MACHINE_ARCH} != "alpha" -SUBDIR+=sys -.endif -SUBDIR+=usr.bin usr.sbin etc +SUBDIR+=sys usr.bin usr.sbin etc # These are last, since it is nice to at least get the base system # rebuilt before you do them. ==== //depot/projects/hammer/bin/dd/args.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.39 2004/07/31 15:13:08 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.40 2004/08/15 19:10:05 rwatson Exp $"); #include @@ -58,6 +58,7 @@ static void f_conv(char *); static void f_count(char *); static void f_files(char *); +static void f_fillchar(char *); static void f_ibs(char *); static void f_if(char *); static void f_obs(char *); @@ -77,6 +78,7 @@ { "conv", f_conv, 0, 0 }, { "count", f_count, C_COUNT, C_COUNT }, { "files", f_files, C_FILES, C_FILES }, + { "fillchar", f_fillchar, C_FILL, C_FILL }, { "ibs", f_ibs, C_IBS, C_BS|C_IBS }, { "if", f_if, C_IF, C_IF }, { "iseek", f_skip, C_SKIP, C_SKIP }, @@ -224,6 +226,16 @@ } static void +f_fillchar(char *arg) +{ + + if (strlen(arg) != 1) + errx(1, "need exactly one fill char"); + + fill_char = arg[0]; +} + +static void f_ibs(char *arg) { uintmax_t res; ==== //depot/projects/hammer/bin/dd/dd.1#6 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.24 2004/05/16 21:34:14 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.25 2004/08/15 19:10:05 rwatson Exp $ .\" .Dd March 5, 2004 .Dt DD 1 @@ -84,6 +84,13 @@ .Ar n input files before terminating. This operand is only applicable when the input device is a tape. +.It Cm fillchar Ns = Ns Ar c +When padding a block in conversion mode or due to use of +.Cm noerror +and +.Cm sync +modes, fill with the specified ASCII character, rather than using a space +or nul. .It Cm ibs Ns = Ns Ar n Set the input block size to .Ar n @@ -247,6 +254,10 @@ bytes (or with spaces if a block oriented conversion value was specified) and processed as a normal input buffer. If the +.Cm fillchar +option is specified, the fill char provided on the command line will override +the automatic selection of fill character. +If the .Cm sync conversion is not specified, the input block is omitted from the output. On input files which are not tapes or pipes, the file offset ==== //depot/projects/hammer/bin/dd/dd.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.42 2004/04/06 20:06:46 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $"); #include #include @@ -80,6 +80,7 @@ size_t cbsz; /* conversion block size */ uintmax_t files_cnt = 1; /* # of files to copy */ const u_char *ctab; /* conversion table */ +char fill_char; /* Character to fill with if defined */ int main(int argc __unused, char *argv[]) @@ -287,7 +288,9 @@ * use spaces. */ if (ddflags & C_SYNC) { - if (ddflags & (C_BLOCK | C_UNBLOCK)) + if (ddflags & C_FILL) + memset(in.dbp, fill_char, in.dbsz); + else if (ddflags & (C_BLOCK | C_UNBLOCK)) memset(in.dbp, ' ', in.dbsz); else memset(in.dbp, 0, in.dbsz); @@ -382,7 +385,9 @@ else if (cfunc == unblock) unblock_close(); if (ddflags & C_OSYNC && out.dbcnt && out.dbcnt < out.dbsz) { - if (ddflags & (C_BLOCK | C_UNBLOCK)) + if (ddflags & C_FILL) + memset(out.dbp, fill_char, out.dbsz - out.dbcnt); + else if (ddflags & (C_BLOCK | C_UNBLOCK)) memset(out.dbp, ' ', out.dbsz - out.dbcnt); else memset(out.dbp, 0, out.dbsz - out.dbcnt); ==== //depot/projects/hammer/bin/dd/dd.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/dd.h,v 1.21 2004/04/06 20:06:46 markm Exp $ + * $FreeBSD: src/bin/dd/dd.h,v 1.22 2004/08/15 19:10:05 rwatson Exp $ */ /* Input/output stream state. */ @@ -94,5 +94,6 @@ #define C_SYNC 0x8000000 #define C_UCASE 0x10000000 #define C_UNBLOCK 0x20000000 +#define C_FILL 0x40000000 #define C_PARITY (C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET) ==== //depot/projects/hammer/bin/dd/extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/extern.h,v 1.14 2004/04/06 20:06:46 markm Exp $ + * $FreeBSD: src/bin/dd/extern.h,v 1.15 2004/08/15 19:10:05 rwatson Exp $ */ void block(void); @@ -60,3 +60,4 @@ extern const u_char e2a_32V[], e2a_POSIX[]; extern const u_char a2ibm_32V[], a2ibm_POSIX[]; extern u_char casetab[]; +extern char fill_char; ==== //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#6 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=8 -$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.21 2004/06/26 23:19:40 mbr Exp $ +$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.23 2004/08/16 21:31:34 mbr Exp $ -ISC DHCP client 3.0.1rc14 +ISC DHCP client 3.0.1 originals can be found at: ftp://ftp.isc.org/isc/dhcp/ @@ -27,8 +27,8 @@ Imported by: - cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \ - src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14 + cvs import -m 'Import ISC DHCP 3.0.1 client.' \ + src/contrib/isc-dhcp ISC isc_dhcp_3_0_1 To make local changes to isc-dhcp, simply patch and commit to the main @@ -46,6 +46,8 @@ r1.6 - document -D option. - remove dhcpd from SEE ALSO section. client/dhclient.c + r1.42 - FPE fix + r1.41 - interface polling r1.35 - interface polling r1.32 - interface polling r1.31 - interface polling @@ -65,8 +67,6 @@ - Remove dhcpd from SEE ALSO section. common/dispatch.c r1.2 - interface polling - common/parse.c - r1.2 - 64bit time_t fix includes/dhcpd.h r1.5 - interface polling r1.4 - interface polling ==== //depot/projects/hammer/contrib/isc-dhcp/README#6 (text+ko) ==== @@ -1,6 +1,6 @@ Internet Systems Consortium DHCP Distribution - Version 3.0.1rc14 - June 09, 2004 + Version 3.0.1 + July 14, 2004 README FILE @@ -96,8 +96,7 @@ RELEASE STATUS -This is fourteenth release candidate of version 3.0.1 of the ISC DHCP -Distribution. +This is release version 3.0.1 of the ISC DHCP Distribution. In this release, the server and relay agent are currently fully functional on NetBSD, Linux systems with kernel version 2.2 or later, @@ -140,17 +139,17 @@ To build the DHCP Distribution, unpack the compressed tar file using the tar utility and the gzip command - type something like: - zcat dhcp-3.0.1rc14.tar.gz |tar xvf - + zcat dhcp-3.0.1.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. CONFIGURING IT -Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just -created and configure the source tree by typing: +Now, cd to the dhcp-3.0.1 subdirectory that you've just created and +configure the source tree by typing: - ./configure + ./configure If the configure utility can figure out what sort of system you're running on, it will create a custom Makefile for you for that ==== //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#6 (text+ko) ==== @@ -1,6 +1,6 @@ Internet Systems Consortium DHCP Distribution - Version 3.0.1rc14 - June 09, 2004 + Version 3.0.1 + July 14, 2004 Release Notes @@ -43,6 +43,25 @@ thanks to all of these good people here, both for working on the code and for prodding me into improving it. + Changes since 3.0.1rc14 + +- The global variable 'cur_time' was centralized and is now uniformly of a + type #defined in system-dependent headers. It had previously been defined + in one of many places as a 32-bit value, and this causes mayhem on 64-bit + big endian systems. It probably wasn't too healthy on little endian + systems either. + +- A printf format string error introduced in rc14 was repaired. + +- AIX system-dependent header file was altered to only define NO_SNPRINTF + if the condition used to #ifdef in vsnprintf in AIX' header files + is false. + +- The Alpha/OSF system-dependent header file was altered to define + NO_SNPRINTF on OS revisions older than 4.0G. + +- omapip/test.c had string.h added to its includes. + Changes since 3.0.1rc13 ! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed ==== //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#10 (text+ko) ==== @@ -32,8 +32,8 @@ #ifndef lint static char ocopyright[] = -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.38 2004/07/06 15:15:14 des Exp $\n" -"$Id: dhclient.c,v 1.129.2.18 2004/06/10 17:59:12 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.42 2004/08/16 21:26:04 mbr Exp $\n" +"$Id: dhclient.c,v 1.129.2.19 2004/07/10 00:11:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -1750,9 +1750,20 @@ broadcast the DHCPREQUEST rather than unicasting. */ if (client -> state == S_REQUESTING || client -> state == S_REBOOTING || - cur_time > client -> active -> rebind) + cur_time > client -> active -> rebind) { +#ifdef ENABLE_POLLING_MODE + /* + * If our state is S_RENEWING we definitly + * have to go through S_INIT first. This can + * happen only if ENABLE_POLLING_MODE is defined. + */ + if (client -> state == S_RENEWING) { + state_init (client); + return; + } +#endif destination.sin_addr = sockaddr_broadcast.sin_addr; - else + } else memcpy (&destination.sin_addr.s_addr, client -> destination.iabuf, sizeof destination.sin_addr.s_addr); ==== //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#6 (text+ko) ==== @@ -1,3 +1,3 @@ /* Current version of ISC DHCP Distribution. */ -#define DHCP_VERSION "V3.0.1rc14" +#define DHCP_VERSION "V3.0.1" ==== //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/hammer/contrib/top/commands.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.9 2004/07/12 15:22:44 alfred Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.10 2004/08/16 07:51:21 alfred Exp $ */ /* @@ -81,7 +81,7 @@ o - specify sort order (pri, size, res, cpu, time)\n", stdout); else fputs("\ -o - specify sort order (read, write, fault, total)\n", stdout); +o - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout); #endif fputs("\ r - renice a process\n\ ==== //depot/projects/hammer/contrib/top/top.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.14 2004/07/12 03:00:50 alfred Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.15 2004/08/16 07:51:21 alfred Exp $ */ /* @@ -95,8 +95,7 @@ char *renice_procs(); #ifdef ORDER -extern int (*proc_compares[])(); -extern int (*io_compares[])(); +extern int (*compares[])(); #else extern int proc_compare(); extern int io_compare(); @@ -570,10 +569,7 @@ get_system_info(&system_info); #ifdef ORDER - if (displaymode == DISP_CPU) - compare = proc_compares[order_index]; - else - compare = io_compares[order_index]; + compare = compares[order_index]; #else if (displaymode == DISP_CPU) compare = proc_compare; ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.87 2004/07/30 23:18:52 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.88 2004/08/16 06:36:21 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -92,6 +92,8 @@ .. nop .. + raid3 + .. stripe .. .. ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.303 2004/04/21 15:28:21 tjr Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.304 2004/08/16 09:31:09 dwmalone Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -51,6 +51,8 @@ .. hr_HR.ISO8859-2 .. + hu_HU.ISO8859-2 + .. ru_RU.KOI8-R .. .. ==== //depot/projects/hammer/etc/rc.d/jail#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.14 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.15 2004/08/16 16:37:06 nectar Exp $ # # PROVIDE: jail @@ -122,6 +122,8 @@ echo '.' echo -n 'Starting jails:' + _tmp_dir=`mktemp -d /tmp/jail.XXXXXXXX` || \ + err 3 "$name: Can't create temp dir, exiting..." for _jail in ${jail_list} do init_variables $_jail @@ -155,7 +157,7 @@ mount -t procfs proc "${jail_procdir}" fi fi - _tmp_jail=/tmp/jail.$$ + _tmp_jail=${_tmp_dir}/jail.$$ jail -i ${jail_rootdir} ${jail_hostname} \ ${jail_ip} ${jail_exec} > ${_tmp_jail} 2>&1 [ "$?" -eq 0 ] && echo -n " $jail_hostname" @@ -164,6 +166,7 @@ rm -f ${_tmp_jail} echo ${_jail_id} > /var/run/jail_${_jail}.id done + rmdir ${_tmp_dir} echo '.' } ==== //depot/projects/hammer/etc/services#11 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.101 2004/07/11 19:20:47 cperciva Exp $ +# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1935,6 +1935,8 @@ vat-control 3457/udp #VAT default control nut 3493/tcp #Network UPS Tools nut 3493/udp #Network UPS Tools +tsp 3653/tcp #Tunnel Setup Protocol +tsp 3653/udp #Tunnel Setup Protocol svn 3690/tcp #Subversion svn 3690/udp #Subversion udt_os 3900/tcp #Unidata UDT OS ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#26 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.140 2004/07/26 21:18:58 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.141 2004/08/15 19:24:17 rwatson Exp $ % -- Gifts for Children -- @@ -13269,6 +13269,12 @@ of zeal, well-meaning but without understanding. -- Justice Louis D. Brandeis % +The hand that feeds the chicken every day finally wrings its neck instead, +thus proving that more sophisticated views about the uniformity of nature +would have been useful to the chicken. + + -- Bertrand Russell, "On Induction" +% The hardest thing in the world to understand is the income tax. -- Albert Einstein % ==== //depot/projects/hammer/include/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.221 2004/08/12 12:36:04 tjr Exp $ +# $FreeBSD: src/include/Makefile,v 1.222 2004/08/16 06:36:20 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -38,7 +38,8 @@ dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ - geom/concat geom/gate geom/label geom/mirror geom/nop geom/stripe \ + geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ + geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm security/mac_biba security/mac_bsdextended \ security/mac_lomac security/mac_mls security/mac_partition \ ==== //depot/projects/hammer/lib/libc/alpha/gen/_set_tp.c#2 (text+ko) ==== @@ -23,10 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.1 2004/08/15 16:18:02 dfr Exp $ + * $FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $ */ -#include +#include +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $"); + +#include #include void ==== //depot/projects/hammer/lib/libpthread/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.51 2004/01/31 05:05:45 marcel Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.52 2004/08/16 03:27:28 davidxu Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -19,6 +19,7 @@ CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-fno-builtin # Uncomment this if you want libpthread to contain debug information for ==== //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#6 (text+ko) ==== @@ -23,7 +23,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/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.5 2004/08/15 16:28:04 dfr Exp $ + * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.7 2004/08/16 14:07:38 davidxu Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -34,6 +34,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) #define THR_GETCONTEXT(ucp) _alpha_save_context(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) PANIC("THR_SETCONTEXT() now in use!\n") ==== //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.8 2004/08/15 16:28:04 dfr Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.9 2004/08/16 03:27:28 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -32,12 +32,14 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ +#include #include #include #include #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #define THR_GETCONTEXT(ucp) \ (void)_amd64_save_context(&(ucp)->uc_mcontext) ==== //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#3 (text+ko) ==== @@ -24,7 +24,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/lib/libpthread/arch/arm/include/pthread_md.h,v 1.3 2004/07/14 00:58:53 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.5 2004/08/16 14:07:38 davidxu Exp $ */ /* @@ -38,6 +38,7 @@ #include #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); int _thr_getcontext(mcontext_t *); ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.9 2004/08/15 16:28:05 dfr Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.10 2004/08/16 03:27:29 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -31,6 +31,7 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ +#include #include #include @@ -38,6 +39,7 @@ extern int _thr_getcontext(mcontext_t *); #define KSE_STACKSIZE 16384 +#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #define THR_GETCONTEXT(ucp) _thr_getcontext(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) _thr_setcontext(&(ucp)->uc_mcontext, 0, NULL) ==== //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#8 (text+ko) ==== @@ -23,7 +23,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/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.14 2004/08/15 16:28:05 dfr Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 16 22:30:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DF6616A4D0; Mon, 16 Aug 2004 22:30:21 +0000 (GMT) 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 DC3BF16A4CE for ; Mon, 16 Aug 2004 22:30:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7E2043D49 for ; Mon, 16 Aug 2004 22:30:20 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GMUKQ2039798 for ; Mon, 16 Aug 2004 22:30:20 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GMUK28039795 for perforce@freebsd.org; Mon, 16 Aug 2004 22:30:20 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 22:30:20 GMT Message-Id: <200408162230.i7GMUK28039795@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 59893 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, 16 Aug 2004 22:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=59893 Change 59893 by peter@peter_daintree on 2004/08/16 22:29:40 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#66 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#41 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#21 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#14 (text+ko) ==== @@ -51,7 +51,6 @@ static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device"); struct legacy_device { - struct resource_list lg_resources; int lg_pcibus; }; @@ -63,15 +62,8 @@ static int legacy_print_child(device_t, device_t); static device_t legacy_add_child(device_t bus, int order, const char *name, int unit); -static struct resource *legacy_alloc_resource(device_t, device_t, int, int *, - u_long, u_long, u_long, u_int); static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); static int legacy_write_ivar(device_t, device_t, int, uintptr_t); -static int legacy_release_resource(device_t, device_t, int, int, - struct resource *); -static int legacy_set_resource(device_t, device_t, int, int, u_long, u_long); -static int legacy_get_resource(device_t, device_t, int, int, u_long *, u_long *); -static void legacy_delete_resource(device_t, device_t, int, int); static device_method_t legacy_methods[] = { /* Device interface */ @@ -88,11 +80,8 @@ DEVMETHOD(bus_add_child, legacy_add_child), DEVMETHOD(bus_read_ivar, legacy_read_ivar), DEVMETHOD(bus_write_ivar, legacy_write_ivar), - DEVMETHOD(bus_set_resource, legacy_set_resource), - DEVMETHOD(bus_get_resource, legacy_get_resource), - DEVMETHOD(bus_alloc_resource, legacy_alloc_resource), - DEVMETHOD(bus_release_resource, legacy_release_resource), - DEVMETHOD(bus_delete_resource, legacy_delete_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -183,30 +172,12 @@ } static int -legacy_print_all_resources(device_t dev) -{ - struct legacy_device *atdev = DEVTOAT(dev); - struct resource_list *rl = &atdev->lg_resources; - int retval = 0; - - if (SLIST_FIRST(rl) || atdev->lg_pcibus != -1) - retval += printf(" at"); - - retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); - retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx"); - retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); - - return retval; -} - -static int legacy_print_child(device_t bus, device_t child) { struct legacy_device *atdev = DEVTOAT(child); int retval = 0; retval += bus_print_child_header(bus, child); - retval += legacy_print_all_resources(child); if (atdev->lg_pcibus != -1) retval += printf(" pcibus %d", atdev->lg_pcibus); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ @@ -224,7 +195,6 @@ M_NOWAIT | M_ZERO); if (atdev == NULL) return(NULL); - resource_list_init(&atdev->lg_resources); atdev->lg_pcibus = -1; child = device_add_child_ordered(bus, order, name, unit); @@ -268,66 +238,6 @@ return 0; } - -static struct resource * -legacy_alloc_resource(device_t bus, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - return (resource_list_alloc(rl, bus, child, type, rid, start, end, - count, flags)); -} - -static int -legacy_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - return (resource_list_release(rl, bus, child, type, rid, r)); -} - -static int -legacy_set_resource(device_t dev, device_t child, int type, int rid, - u_long start, u_long count) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - resource_list_add(rl, type, rid, start, start + count - 1, count); - return(0); -} - -static int -legacy_get_resource(device_t dev, device_t child, int type, int rid, - u_long *startp, u_long *countp) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - struct resource_list_entry *rle; - - rle = resource_list_find(rl, type, rid); - if (!rle) - return(ENOENT); - if (startp) - *startp = rle->start; - if (countp) - *countp = rle->count; - return(0); -} - -static void -legacy_delete_resource(device_t dev, device_t child, int type, int rid) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - resource_list_delete(rl, type, rid); -} - /* * Legacy CPU attachment when ACPI is not available. Drivers like * cpufreq(4) hang off this. ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#66 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_cpu.h" #include "opt_kstack_pages.h" +#include "opt_mp_watchdog.h" #include #include @@ -56,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -1070,8 +1072,15 @@ mp_grab_cpu_hlt(void) { u_int mask = PCPU_GET(cpumask); +#ifdef MP_WATCHDOG + u_int cpuid = PCPU_GET(cpuid); +#endif int retval; +#ifdef MP_WATCHDOG + ap_watchdog(cpuid); +#endif + retval = mask & hlt_cpus_mask; while (mask & hlt_cpus_mask) __asm __volatile("sti; hlt" : : : "memory"); ==== //depot/projects/hammer/sys/amd64/conf/NOTES#41 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1167) +# (XXX from i386:NOTES,v 1.1168) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $ # @@ -159,6 +159,7 @@ # # AGP GART support device agp +options AGP_AMD64_GART # Included GART code for AMD64 machines. ##################################################################### ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#21 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 16 23:20:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9ABB16A4D0; Mon, 16 Aug 2004 23:20:23 +0000 (GMT) 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 86BF016A4CE for ; Mon, 16 Aug 2004 23:20:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69E5143D2D for ; Mon, 16 Aug 2004 23:20:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GNKN6j042070 for ; Mon, 16 Aug 2004 23:20:23 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GNKNhl042063 for perforce@freebsd.org; Mon, 16 Aug 2004 23:20:23 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 23:20:23 GMT Message-Id: <200408162320.i7GNKNhl042063@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 59898 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, 16 Aug 2004 23:20:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=59898 Change 59898 by peter@peter_daintree on 2004/08/16 23:19:28 IFC @59897 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#98 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#52 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#48 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#52 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#14 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#44 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#29 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#10 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#13 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#27 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.56 2004/07/08 01:28:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.57 2004/08/16 22:53:03 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#30 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.150 2004/05/16 22:43:57 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.79 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.80 2004/08/16 23:10:46 peter Exp $"); /* * Interface to new debugger. ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#27 (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/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#31 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.10 2004/07/08 01:42:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#39 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.9 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.10 2004/08/16 22:55:32 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#98 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.617 2004/08/10 12:15:27 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.618 2004/08/16 22:57:47 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#52 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.278 2004/08/09 23:57:59 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.279 2004/08/16 22:56:20 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#48 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.236 2004/08/11 23:23:05 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#52 (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.420 2004/08/16 12:51:32 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.421 2004/08/16 22:59:24 peter Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.3 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.4 2004/08/16 23:12:30 peter Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#44 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.12 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.13 2004/08/16 23:12:30 peter Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/clock.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.213 2004/07/11 18:07:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.214 2004/08/16 22:52:02 peter Exp $"); /* * Routines to handle clock hardware. ==== //depot/projects/hammer/sys/amd64/isa/isa.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.25 2004/04/05 21:25:52 imp Exp $ + * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.26 2004/08/16 22:51:44 peter Exp $ */ #ifndef _I386_ISA_ISA_H_ ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.18 2004/04/05 21:25:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $"); /* * code to manage AT bus ==== //depot/projects/hammer/sys/dev/ciss/ciss.c#27 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.55 2004/07/28 06:18:05 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.56 2004/08/16 23:13:16 peter Exp $ */ /* @@ -630,7 +630,8 @@ ciss_printf(sc, "can't allocate interrupt\n"); return(ENXIO); } - if (bus_setup_intr(sc->ciss_dev, sc->ciss_irq_resource, INTR_TYPE_CAM, ciss_intr, sc, + if (bus_setup_intr(sc->ciss_dev, sc->ciss_irq_resource, + INTR_TYPE_CAM|INTR_ENTROPY, ciss_intr, sc, &sc->ciss_intr)) { ciss_printf(sc, "can't set up interrupt\n"); return(ENXIO); From owner-p4-projects@FreeBSD.ORG Mon Aug 16 23:53:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE6016A4D0; Mon, 16 Aug 2004 23:53:04 +0000 (GMT) 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 C33D316A4CE for ; Mon, 16 Aug 2004 23:53:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3BBD43D45 for ; Mon, 16 Aug 2004 23:53:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GNr4Cq042979 for ; Mon, 16 Aug 2004 23:53:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GNr4gd042976 for perforce@freebsd.org; Mon, 16 Aug 2004 23:53:04 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 23:53:04 GMT Message-Id: <200408162353.i7GNr4gd042976@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 59901 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, 16 Aug 2004 23:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=59901 Change 59901 by peter@peter_daintree on 2004/08/16 23:52:54 the amd64 gart thingy is for 32 bit only Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#42 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#42 (text+ko) ==== @@ -159,7 +159,6 @@ # # AGP GART support device agp -options AGP_AMD64_GART # Included GART code for AMD64 machines. ##################################################################### From owner-p4-projects@FreeBSD.ORG Mon Aug 16 23:55:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A9D16A5A8; Mon, 16 Aug 2004 23:55:07 +0000 (GMT) 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 B77E616A5A0 for ; Mon, 16 Aug 2004 23:55:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9727043D1F for ; Mon, 16 Aug 2004 23:55:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GNt7Mt043014 for ; Mon, 16 Aug 2004 23:55:07 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GNt7Zn043011 for perforce@freebsd.org; Mon, 16 Aug 2004 23:55:07 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 23:55:07 GMT Message-Id: <200408162355.i7GNt7Zn043011@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 59902 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, 16 Aug 2004 23:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=59902 Change 59902 by peter@peter_daintree on 2004/08/16 23:54:27 replace a comment with a kassert Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#99 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#99 (text+ko) ==== @@ -1048,8 +1048,7 @@ if (va >= VM_MAXUSER_ADDRESS) return 0; - if (ptepde == 0) - ptepde = *pmap_pde(pmap, va); + KASSERT(ptepde != 0, ("pmap_unuse_pt: ptepde != 0")); mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); return pmap_unwire_pte_hold(pmap, va, mpte); } From owner-p4-projects@FreeBSD.ORG Mon Aug 16 23:56:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D47A16A521; Mon, 16 Aug 2004 23:56:09 +0000 (GMT) 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 7493D16A4DC for ; Mon, 16 Aug 2004 23:56:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5546743D2F for ; Mon, 16 Aug 2004 23:56:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GNu9QM043096 for ; Mon, 16 Aug 2004 23:56:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GNu97W043093 for perforce@freebsd.org; Mon, 16 Aug 2004 23:56:09 GMT (envelope-from peter@freebsd.org) Date: Mon, 16 Aug 2004 23:56:09 GMT Message-Id: <200408162356.i7GNu97W043093@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 59903 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, 16 Aug 2004 23:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=59903 Change 59903 by peter@peter_daintree on 2004/08/16 23:55:09 remove whitespace changes Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#30 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#30 (text+ko) ==== @@ -102,12 +102,14 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); + void elf64_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) { } + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, From owner-p4-projects@FreeBSD.ORG Tue Aug 17 02:59:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2816C16A4D0; Tue, 17 Aug 2004 02:59:55 +0000 (GMT) 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 F01B216A4CE for ; Tue, 17 Aug 2004 02:59:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D08B943D1F for ; Tue, 17 Aug 2004 02:59:54 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7H2xsQW048699 for ; Tue, 17 Aug 2004 02:59:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7H2xski048696 for perforce@freebsd.org; Tue, 17 Aug 2004 02:59:54 GMT (envelope-from peter@freebsd.org) Date: Tue, 17 Aug 2004 02:59:54 GMT Message-Id: <200408170259.i7H2xski048696@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 59911 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: Tue, 17 Aug 2004 02:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=59911 Change 59911 by peter@peter_daintree on 2004/08/17 02:59:14 mp_watchdog implementation Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/hammer/sys/amd64/include/mp_watchdog.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 17 03:02:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D008216A4D0; Tue, 17 Aug 2004 03:02:03 +0000 (GMT) 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 A857816A4CE for ; Tue, 17 Aug 2004 03:02:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BEAF43D49 for ; Tue, 17 Aug 2004 03:02:03 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7H323Z9048926 for ; Tue, 17 Aug 2004 03:02:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7H323GY048923 for perforce@freebsd.org; Tue, 17 Aug 2004 03:02:03 GMT (envelope-from peter@freebsd.org) Date: Tue, 17 Aug 2004 03:02:03 GMT Message-Id: <200408170302.i7H323GY048923@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 59912 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: Tue, 17 Aug 2004 03:02:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=59912 Change 59912 by peter@peter_daintree on 2004/08/17 03:01:02 mfi386: mp_watchdog Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#54 edit .. //depot/projects/hammer/sys/conf/options.amd64#31 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#54 (text+ko) ==== @@ -79,6 +79,7 @@ amd64/amd64/machdep.c standard amd64/amd64/mem.c optional mem amd64/amd64/mp_machdep.c optional smp +amd64/amd64/mp_watchdog.c optional mp_watchdog smp amd64/amd64/mpboot.S optional smp amd64/amd64/mptable.c optional mptable amd64/amd64/mptable_pci.c optional mptable pci ==== //depot/projects/hammer/sys/conf/options.amd64#31 (text+ko) ==== @@ -6,6 +6,7 @@ MAXMEM PERFMON opt_perfmon.h PMAP_SHPGPERPROC opt_pmap.h +MP_WATCHDOG opt_mp_watchdog.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems From owner-p4-projects@FreeBSD.ORG Tue Aug 17 22:32:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FAFE16A4D0; Tue, 17 Aug 2004 22:32:43 +0000 (GMT) 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 EDE7F16A4CE for ; Tue, 17 Aug 2004 22:32:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE7D243D31 for ; Tue, 17 Aug 2004 22:32:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7HMWgCM088537 for ; Tue, 17 Aug 2004 22:32:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7HMWg16088534 for perforce@freebsd.org; Tue, 17 Aug 2004 22:32:42 GMT (envelope-from peter@freebsd.org) Date: Tue, 17 Aug 2004 22:32:42 GMT Message-Id: <200408172232.i7HMWg16088534@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 59941 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: Tue, 17 Aug 2004 22:32:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=59941 Change 59941 by peter@peter_daintree on 2004/08/17 22:32:37 IFC @59940 Affected files ... .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#11 integrate .. //depot/projects/hammer/lib/libc/locale/wcwidth.3#5 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#10 integrate .. //depot/projects/hammer/sys/conf/files#75 integrate .. //depot/projects/hammer/sys/conf/options#51 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#1 branch .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#14 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#14 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/hammer/sys/isa/psm.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#28 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/ahc_isa/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bridge.c#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#20 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#23 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#1 branch .. //depot/projects/hammer/sys/netinet/ip_input.c#35 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#33 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#19 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#26 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#29 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#5 integrate .. //depot/projects/hammer/tools/tools/nanobsd/customize.sh#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#6 integrate .. //depot/projects/hammer/tools/tools/nanobsd/localfiles#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#3 integrate Differences ... ==== //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef lint static char ocopyright[] = -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.42 2004/08/16 21:26:04 mbr Exp $\n" +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.43 2004/08/16 22:35:56 mbr Exp $\n" "$Id: dhclient.c,v 1.129.2.19 2004/07/10 00:11:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ @@ -2073,6 +2073,9 @@ else oc = (struct option_cache *)0; + if (client->sent_options != 0L) + option_state_dereference (&client -> sent_options, MDL); + make_client_options (client, lease, &request, oc, ((client -> state == S_REQUESTING || client -> state == S_REBOOTING) @@ -2095,7 +2098,6 @@ (struct data_string *)0, client -> config -> vendor_space_name); - option_state_dereference (&client -> sent_options, MDL); if (client -> packet_length < BOOTP_MIN_LEN) client -> packet_length = BOOTP_MIN_LEN; ==== //depot/projects/hammer/lib/libc/locale/wcwidth.3#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.4 2004/08/12 12:32:14 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.6 2004/08/17 04:56:03 trhodes Exp $ .\" -.Dd August 12, 2004 +.Dd August 17, 2004 .Dt WCWIDTH 3 .Os .Sh NAME ==== //depot/projects/hammer/share/man/man4/uscanner.4#10 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.14 2004/08/04 08:11:33 blackend Exp $ +.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.15 2004/08/17 07:44:25 blackend Exp $ .\" -.Dd October 26, 2000 +.Dd August 04, 2004 .Dt USCANNER 4 .Os .Sh NAME ==== //depot/projects/hammer/sys/conf/files#75 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.941 2004/08/16 06:36:20 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.943 2004/08/17 22:05:53 andre Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -318,9 +318,9 @@ dev/aic/aic.c optional aic dev/aic/aic_pccard.c optional aic card dev/aic/aic_pccard.c optional aic pccard -dev/aic7xxx/aic7770.c optional ahc eisa +dev/aic7xxx/aic7770.c optional ahc dev/aic7xxx/ahc_eisa.c optional ahc eisa -#dev/aic7xxx/ahc_isa.c optional ahc isa +dev/aic7xxx/ahc_isa.c optional ahc isa dev/aic7xxx/ahc_pci.c optional ahc pci dev/aic7xxx/aic7xxx.c optional ahc dev/aic7xxx/aic7xxx_93cx6.c optional ahc @@ -1484,6 +1484,7 @@ netinet/ip_encap.c optional inet6 netinet/ip_fastfwd.c optional inet netinet/ip_fw2.c optional ipfirewall +netinet/ip_fw_pfil.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_mroute.c optional mrouting ==== //depot/projects/hammer/sys/conf/options#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.474 2004/08/16 06:36:20 pjd Exp $ +# $FreeBSD: src/sys/conf/options,v 1.475 2004/08/17 22:05:53 andre Exp $ # # On the handling of kernel options # @@ -347,6 +347,7 @@ IPFIREWALL_VERBOSE opt_ipfw.h IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h +IPFIREWALL_FORWARD opt_ipfw.h IPV6FIREWALL opt_ip6fw.h IPV6FIREWALL_VERBOSE opt_ip6fw.h IPV6FIREWALL_VERBOSE_LIMIT opt_ip6fw.h ==== //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.35 2004/08/13 06:21:44 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.36 2004/08/17 18:36:07 njl Exp $ */ #include "opt_acpi.h" @@ -274,7 +274,12 @@ acpi_UserNotify("CMBAT", h, notify); - ACPI_SERIAL_BEGIN(cmbat); + /* + * Clear the appropriate last updated time. The next call to retrieve + * the battery status will get the new value for us. We don't need to + * acquire a lock since we are only clearing the time stamp and since + * calling _BST/_BIF can trigger a notify, we could deadlock also. + */ switch (notify) { case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: @@ -287,7 +292,6 @@ default: break; } - ACPI_SERIAL_END(cmbat); } static int ==== //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.33 2004/03/17 17:50:25 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.34 2004/08/17 00:14:30 gibbs Exp $"); #include @@ -159,41 +159,6 @@ return (0); } -int -aic7770_map_registers(struct ahc_softc *ahc, u_int unused_ioport_arg) -{ - struct resource *regs; - int rid; - - rid = 0; - regs = bus_alloc_resource_any(ahc->dev_softc, SYS_RES_IOPORT, &rid, - RF_ACTIVE); - if (regs == NULL) { - device_printf(ahc->dev_softc, "Unable to map I/O space?!\n"); - return ENOMEM; - } - ahc->platform_data->regs_res_type = SYS_RES_IOPORT; - ahc->platform_data->regs_res_id = rid, - ahc->platform_data->regs = regs; - ahc->tag = rman_get_bustag(regs); - ahc->bsh = rman_get_bushandle(regs); - return (0); -} - -int -aic7770_map_int(struct ahc_softc *ahc, int irq) -{ - int zero; - - zero = 0; - ahc->platform_data->irq = - bus_alloc_resource_any(ahc->dev_softc, SYS_RES_IRQ, &zero, - RF_ACTIVE); - if (ahc->platform_data->irq == NULL) - return (ENOMEM); - ahc->platform_data->irq_res_type = SYS_RES_IRQ; - return (ahc_map_int(ahc)); -} static device_method_t ahc_eisa_device_methods[] = { /* Device interface */ ==== //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.61 2004/03/17 17:50:25 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.62 2004/08/17 00:14:30 gibbs Exp $"); #include @@ -237,22 +237,3 @@ ahc->platform_data->regs = regs; return (0); } - -int -ahc_pci_map_int(struct ahc_softc *ahc) -{ - int zero; - - zero = 0; - ahc->platform_data->irq = - bus_alloc_resource_any(ahc->dev_softc, SYS_RES_IRQ, &zero, - RF_ACTIVE | RF_SHAREABLE); - if (ahc->platform_data->irq == NULL) { - device_printf(ahc->dev_softc, - "bus_alloc_resource() failed to allocate IRQ\n"); - return (ENOMEM); - } - ahc->platform_data->irq_res_type = SYS_RES_IRQ; - return (ahc_map_int(ahc)); -} - ==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#16 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.30 2004/08/04 17:55:33 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.31 2004/08/17 00:14:30 gibbs Exp $"); #include #include #include @@ -8351,9 +8351,14 @@ ahd_queue_scb(ahd, scb); /* * Ensure we have enough time to actually - * retrieve the sense. + * retrieve the sense, but only schedule + * the timer if we are not in recovery or + * this is a recovery SCB that is allowed + * to have an active timer. */ - aic_scb_timer_reset(scb, 5 * 1000000); + if (ahd->scb_data.recovery_scbs == 0 + || (scb->flags & SCB_RECOVERY_SCB) != 0) + aic_scb_timer_reset(scb, 5 * 1000000); break; } case SCSI_STATUS_OK: @@ -9441,15 +9446,6 @@ * In either case (selection or reselection), * we will now issue a target reset to the * timed-out device. - * - * Set the MK_MESSAGE control bit indicating - * that we desire to send a message. We - * also set the disconnected flag since - * in the paging case there is no guarantee - * that our SCB control byte matches the - * version on the card. We don't want the - * sequencer to abort the command thinking - * an unsolicited reselection occurred. */ scb->flags |= SCB_DEVICE_RESET; scb->hscb->cdb_len = 0; ==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#15 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.20 2004/08/04 17:55:34 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.21 2004/08/17 00:14:30 gibbs Exp $ */ #ifndef _AIC79XX_H_ @@ -667,12 +667,15 @@ */ struct scb *scbindex[AHD_SCB_MAX]; + u_int recovery_scbs; /* Transactions currently in recovery */ + /* * "Bus" addresses of our data structures. */ bus_dma_tag_t hscb_dmat; /* dmat for our hardware SCB array */ bus_dma_tag_t sg_dmat; /* dmat for our sg segments */ bus_dma_tag_t sense_dmat; /* dmat for our sense buffers */ + SLIST_HEAD(, map_node) hscb_maps; SLIST_HEAD(, map_node) sg_maps; SLIST_HEAD(, map_node) sense_maps; @@ -1068,6 +1071,8 @@ uint8_t valid_tag; }; +#define AIC_SCB_DATA(softc) (&(softc)->scb_data) + struct ahd_softc { bus_space_tag_t tags[2]; bus_space_handle_t bshs[2]; ==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.18 2004/08/04 17:55:34 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.19 2004/08/17 00:14:30 gibbs Exp $"); #include #include @@ -263,40 +263,31 @@ } #endif - /* - * If the recovery SCB completes, we have to be - * out of our timeout. - */ if ((scb->flags & SCB_RECOVERY_SCB) != 0) { struct scb *list_scb; - /* - * We were able to complete the command successfully, - * so reinstate the timeouts for all other pending - * commands. - */ - LIST_FOREACH(list_scb, &ahd->pending_scbs, pending_links) { - union ccb *ccb; - uint64_t time; + ahd->scb_data.recovery_scbs--; - ccb = list_scb->io_ctx; - if (ccb->ccb_h.timeout == CAM_TIME_INFINITY) - continue; - - time = ccb->ccb_h.timeout; - time *= hz; - time /= 1000; - ccb->ccb_h.timeout_ch = - timeout(ahd_platform_timeout, list_scb, time); - } - if (aic_get_transaction_status(scb) == CAM_BDR_SENT || aic_get_transaction_status(scb) == CAM_REQ_ABORTED) aic_set_transaction_status(scb, CAM_CMD_TIMEOUT); - ahd_print_path(ahd, scb); - printf("no longer in timeout, status = %x\n", - ccb->ccb_h.status); + if (ahd->scb_data.recovery_scbs == 0) { + /* + * All recovery actions have completed successfully, + * so reinstate the timeouts for all other pending + * commands. + */ + LIST_FOREACH(list_scb, + &ahd->pending_scbs, pending_links) { + + aic_scb_timer_reset(scb, aic_get_timeout(scb)); + } + + ahd_print_path(ahd, scb); + printf("no longer in timeout, status = %x\n", + ccb->ccb_h.status); + } } /* Don't clobber any existing error state */ @@ -1123,18 +1114,7 @@ ccb->ccb_h.status |= CAM_SIM_QUEUED; - if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { - uint64_t time; - - if (ccb->ccb_h.timeout == CAM_TIME_DEFAULT) - ccb->ccb_h.timeout = 5 * 1000; - - time = ccb->ccb_h.timeout; - time *= hz; - time /= 1000; - ccb->ccb_h.timeout_ch = - timeout(ahd_platform_timeout, (caddr_t)scb, time); - } + aic_scb_timer_start(scb); if ((scb->flags & SCB_TARGET_IMMEDIATE) != 0) { /* Define a mapping from our tag to the SCB. */ ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#14 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.101 2004/08/13 21:39:14 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.102 2004/08/17 00:14:30 gibbs Exp $"); #include #include #include @@ -377,6 +377,9 @@ if ((scb = TAILQ_FIRST(queue)) != NULL && (scb->flags & SCB_ACTIVE) == 0) { scb->flags |= SCB_ACTIVE; + /* + * Timers are disabled while recovery is in progress. + */ aic_scb_timer_start(scb); ahc_queue_scb(ahc, scb); } @@ -578,9 +581,14 @@ ahc_outb(ahc, RETURN_1, SEND_SENSE); /* * Ensure we have enough time to actually - * retrieve the sense. + * retrieve the sense, but only schedule + * the timer if we are not in recovery or + * this is a recovery SCB that is allowed + * to have an active timer. */ - aic_scb_timer_reset(scb, 5 * 1000000); + if (ahc->scb_data->recovery_scbs == 0 + || (scb->flags & SCB_RECOVERY_SCB) != 0) + aic_scb_timer_reset(scb, 5 * 1000000); break; } default: ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#8 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.51 2004/08/17 00:14:31 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -613,6 +613,8 @@ struct scb *scbarray; /* Array of kernel SCBs */ struct scsi_sense_data *sense; /* Per SCB sense data */ + u_int recovery_scbs; /* Transactions currently in recovery */ + /* * "Bus" addresses of our data structures. */ @@ -920,6 +922,8 @@ typedef int (*ahc_bus_resume_t)(struct ahc_softc *); typedef void ahc_callback_t (void *); +#define AIC_SCB_DATA(softc) ((softc)->scb_data) + struct ahc_softc { bus_space_tag_t tag; bus_space_handle_t bsh; ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.40 2004/07/15 08:26:00 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.41 2004/08/17 00:14:31 gibbs Exp $"); #include #include @@ -90,6 +90,20 @@ ahc_map_int(struct ahc_softc *ahc) { int error; + int zero; + int shareable; + + zero = 0; + shareable = (ahc->flags & AHC_EDGE_INTERRUPT) ? 0: RF_SHAREABLE; + ahc->platform_data->irq = + bus_alloc_resource_any(ahc->dev_softc, SYS_RES_IRQ, &zero, + RF_ACTIVE | shareable); + if (ahc->platform_data->irq == NULL) { + device_printf(ahc->dev_softc, + "bus_alloc_resource() failed to allocate IRQ\n"); + return (ENOMEM); + } + ahc->platform_data->irq_res_type = SYS_RES_IRQ; /* Hook up our interrupt handler */ error = bus_setup_intr(ahc->dev_softc, ahc->platform_data->irq, @@ -102,6 +116,27 @@ return (error); } +int +aic7770_map_registers(struct ahc_softc *ahc, u_int unused_ioport_arg) +{ + struct resource *regs; + int rid; + + rid = 0; + regs = bus_alloc_resource_any(ahc->dev_softc, SYS_RES_IOPORT, &rid, + RF_ACTIVE); + if (regs == NULL) { + device_printf(ahc->dev_softc, "Unable to map I/O space?!\n"); + return ENOMEM; + } + ahc->platform_data->regs_res_type = SYS_RES_IOPORT; + ahc->platform_data->regs_res_id = rid, + ahc->platform_data->regs = regs; + ahc->tag = rman_get_bustag(regs); + ahc->bsh = rman_get_bushandle(regs); + return (0); +} + /* * Attach all the sub-devices we can find */ @@ -346,22 +381,28 @@ if ((scb->flags & SCB_RECOVERY_SCB) != 0) { struct scb *list_scb; - /* - * We were able to complete the command successfully, - * so renew the timeouts for all other pending - * commands. - */ - LIST_FOREACH(list_scb, &ahc->pending_scbs, pending_links) { - - aic_scb_timer_reset(scb, aic_get_timeout(scb)); - } + ahc->scb_data->recovery_scbs--; if (aic_get_transaction_status(scb) == CAM_BDR_SENT || aic_get_transaction_status(scb) == CAM_REQ_ABORTED) aic_set_transaction_status(scb, CAM_CMD_TIMEOUT); - ahc_print_path(ahc, scb); - printf("no longer in timeout, status = %x\n", - ccb->ccb_h.status); + + if (ahc->scb_data->recovery_scbs == 0) { + /* + * All recovery actions have completed successfully, + * so reinstate the timeouts for all other pending + * commands. + */ + LIST_FOREACH(list_scb, &ahc->pending_scbs, + pending_links) { + + aic_scb_timer_reset(scb, aic_get_timeout(scb)); + } + + ahc_print_path(ahc, scb); + printf("no longer in timeout, status = %x\n", + ccb->ccb_h.status); + } } /* Don't clobber any existing error state */ @@ -1230,19 +1271,6 @@ ccb->ccb_h.status |= CAM_SIM_QUEUED; - if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { - uint64_t time; - - if (ccb->ccb_h.timeout == CAM_TIME_DEFAULT) - ccb->ccb_h.timeout = 5 * 1000; - - time = ccb->ccb_h.timeout; - time *= hz; - time /= 1000; - ccb->ccb_h.timeout_ch = - timeout(ahc_platform_timeout, (caddr_t)scb, time); - } - /* * We only allow one untagged transaction * per target in the initiator role unless @@ -1265,6 +1293,11 @@ } scb->flags |= SCB_ACTIVE; + /* + * Timers are disabled while recovery is in progress. + */ + aic_scb_timer_start(scb); + if ((scb->flags & SCB_TARGET_IMMEDIATE) != 0) { /* Define a mapping from our tag to the SCB. */ ahc->scb_data->scbindex[scb->hscb->tag] = scb; ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#18 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.26 2004/05/30 20:08:24 phk Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.27 2004/08/17 00:14:31 gibbs Exp $ */ #ifndef _AIC7XXX_FREEBSD_H_ @@ -256,15 +256,35 @@ { } +/************************* Initialization/Teardown ****************************/ +int ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg); +void ahc_platform_free(struct ahc_softc *ahc); +int ahc_map_int(struct ahc_softc *ahc); +int ahc_attach(struct ahc_softc *); +int ahc_softc_comp(struct ahc_softc *lahc, struct ahc_softc *rahc); +int ahc_detach(device_t); + /********************************** PCI ***************************************/ #ifdef AIC_PCI_CONFIG int ahc_pci_map_registers(struct ahc_softc *ahc); -int ahc_pci_map_int(struct ahc_softc *ahc); +#define ahc_pci_map_int ahc_map_int #endif /*AIC_PCI_CONFIG*/ /******************************** VL/EISA *************************************/ int aic7770_map_registers(struct ahc_softc *ahc, u_int port); -int aic7770_map_int(struct ahc_softc *ahc, int irq); +static __inline int aic7770_map_int(struct ahc_softc *, int); + +static __inline int +aic7770_map_int(struct ahc_softc *ahc, int irq) +{ + /* + * The IRQ is unused in the FreeBSD + * implementation since the EISA and + * ISA attachments register the IRQ + * with newbus before the core is called. + */ + return ahc_map_int(ahc); +} /********************************* Debug **************************************/ static __inline void ahc_print_path(struct ahc_softc *, struct scb *); @@ -287,14 +307,6 @@ void ahc_platform_set_tags(struct ahc_softc *, struct ahc_devinfo *, int /*enable*/); -/************************* Initialization/Teardown ****************************/ -int ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg); -void ahc_platform_free(struct ahc_softc *ahc); -int ahc_map_int(struct ahc_softc *ahc); -int ahc_attach(struct ahc_softc *); -int ahc_softc_comp(struct ahc_softc *lahc, struct ahc_softc *rahc); -int ahc_detach(device_t); - /****************************** Interrupts ************************************/ void ahc_platform_intr(void *); static __inline void ahc_platform_flushwork(struct ahc_softc *ahc); ==== //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.c,v 1.2 2003/12/19 18:34:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.c,v 1.3 2004/08/17 00:14:31 gibbs Exp $"); static void aic_recovery_thread(void *arg); @@ -46,15 +46,7 @@ scb->flags |= SCB_RECOVERY_SCB; - /* - * Take all queued, but not sent SCBs out of the equation. - * Also ensure that no new CCBs are queued to us while we - * try to fix this problem. - */ - if ((scb->io_ctx->ccb_h.status & CAM_RELEASE_SIMQ) == 0) { - xpt_freeze_simq(SCB_GET_SIM(aic, scb), /*count*/1); - scb->io_ctx->ccb_h.status |= CAM_RELEASE_SIMQ; - } + AIC_SCB_DATA(aic)->recovery_scbs++; /* * Go through all of our pending SCBs and remove ==== //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic_osm_lib.h#5 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.h,v 1.2 2004/05/11 20:33:42 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.h,v 1.3 2004/08/17 00:14:31 gibbs Exp $ */ /******************************** OS Includes *********************************/ @@ -223,7 +223,8 @@ aic_scb_timer_start(struct scb *scb) { - if (scb->io_ctx->ccb_h.timeout != CAM_TIME_INFINITY) { + if (AIC_SCB_DATA(scb->aic_softc)->recovery_scbs == 0 + && scb->io_ctx->ccb_h.timeout != CAM_TIME_INFINITY) { uint64_t time; time = scb->io_ctx->ccb_h.timeout; ==== //depot/projects/hammer/sys/isa/psm.c#21 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/psm.c,v 1.78 2004/08/16 20:19:09 philip Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/psm.c,v 1.79 2004/08/17 18:12:37 gibbs Exp $"); #include "opt_psm.h" @@ -200,6 +200,7 @@ #define PSM_OPEN 1 /* Device is open */ #define PSM_ASLP 2 /* Waiting for mouse data */ #define PSM_SOFTARMED 4 /* Software interrupt armed */ +#define PSM_NEED_SYNCBITS 8 /* Set syncbits using next data pkt */ /* driver configuration flags (config) */ #define PSM_CONFIG_RESOLUTION 0x000f /* resolution */ @@ -739,16 +740,8 @@ set_mouse_mode(kbdc); } - /* request a data packet and extract sync. bits */ - if (get_mouse_status(kbdc, stat, 1, 3) < 3) { - log(LOG_DEBUG, "psm%d: failed to get data (doinitialize).\n", - sc->unit); - sc->mode.syncmask[0] = 0; - } else { - sc->mode.syncmask[1] = stat[0] & sc->mode.syncmask[0]; /* syncbits */ - /* the NetScroll Mouse will send three more bytes... Ignore them */ - empty_aux_buffer(kbdc, 5); - } + /* Record sync on the next data packet we see. */ + sc->flags |= PSM_NEED_SYNCBITS; /* just check the status of the mouse */ if (get_mouse_status(kbdc, stat, 0, 3) < 3) @@ -890,7 +883,8 @@ (c & KBD_KBD_CONTROL_BITS) | KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) { /* CONTROLLER ERROR */ - log(LOG_ERR, "psm%d: failed to disable the aux port (reinitialize).\n", + log(LOG_ERR, + "psm%d: failed to disable the aux port (reinitialize).\n", sc->unit); err = EIO; } @@ -1209,15 +1203,8 @@ } set_mouse_scaling(sc->kbdc, 1); - /* request a data packet and extract sync. bits */ - if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) { - printf("psm%d: failed to get data.\n", unit); - sc->mode.syncmask[0] = 0; - } else { - sc->mode.syncmask[1] = stat[0] & sc->mode.syncmask[0]; /* syncbits */ - /* the NetScroll Mouse will send three more bytes... Ignore them */ - empty_aux_buffer(sc->kbdc, 5); - } + /* Record sync on the next data packet we see. */ + sc->flags |= PSM_NEED_SYNCBITS; /* just check the status of the mouse */ /* @@ -2081,6 +2068,11 @@ c = pb->ipacket[0]; if ((c & sc->mode.syncmask[0]) != sc->mode.syncmask[1]) { + if ((sc->flags & PSM_NEED_SYNCBITS) != 0) { + sc->mode.syncmask[1] = (c & sc->mode.syncmask[0]); + sc->flags &= ~PSM_NEED_SYNCBITS; + goto valid_sync; + } #if DEBUG log(LOG_DEBUG, "psmintr: out of sync (%04x != %04x) %d" " cmds since last error.\n", @@ -2119,6 +2111,7 @@ } continue; } +valid_sync: /* if this packet is at all bogus then drop the packet. */ if (haderror || !timeelapsed(&sc->lastinputerr, psmerrsecs, psmerrusecs, &now)) { ==== //depot/projects/hammer/sys/kern/kern_intr.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.112 2004/08/06 03:39:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.113 2004/08/17 04:09:09 rwatson Exp $"); #include "opt_ddb.h" @@ -556,6 +556,9 @@ * on some machines, but we don't * want to always delay, so only delay * while warming up. + * + * XXXRW: Calling DELAY() in the interrupt + * path surely needs to be revisited. */ if (warming != 0) { DELAY(1); ==== //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile#5 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile,v 1.4 2003/01/22 21:56:54 gibbs Exp $ +# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile,v 1.5 2004/08/17 00:14:31 gibbs Exp $ .PATH: ${.CURDIR}/../../../dev/aic7xxx KMOD= ahc -SUBDIR= ahc_eisa ahc_pci +SUBDIR= ahc_eisa ahc_isa ahc_pci GENSRCS= aic7xxx_{seq,reg}.h AHC_REG_PRETTY_PRINT=1 @@ -29,7 +29,7 @@ ${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq SRCS= ${GENSRCS} -SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c +SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c aic7770.c SRCS+= opt_scsi.h opt_aic7xxx.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h ==== //depot/projects/hammer/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile,v 1.2 2004/06/09 21:51:02 imp Exp $ +# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile,v 1.3 2004/08/17 00:14:31 gibbs Exp $ .PATH: ${.CURDIR}/../../../../dev/aic7xxx KMOD= ahc_eisa @@ -7,8 +7,8 @@ ../aic7xxx_reg.h: ( cd .. ; ${MAKE} aic7xxx_reg.h ) -SRCS= ahc_eisa.c aic7770.c ../aic7xxx_reg.h -SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h +SRCS= ahc_eisa.c ../aic7xxx_reg.h +SRCS+= device_if.h bus_if.h eisa_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. ==== //depot/projects/hammer/sys/modules/ipfw/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.16 2002/06/28 08:10:07 julian Exp $ +# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.17 2004/08/17 22:05:53 andre Exp $ .PATH: ${.CURDIR}/../../netinet KMOD= ipfw -SRCS= ip_fw2.c +SRCS= ip_fw2.c ip_fw_pfil.c CFLAGS+= -DIPFIREWALL # ==== //depot/projects/hammer/sys/net/bridge.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/bridge.c,v 1.81 2004/07/05 16:28:31 rwatson Exp $ + * $FreeBSD: src/sys/net/bridge.c,v 1.82 2004/08/17 22:05:53 andre Exp $ */ /* @@ -1003,6 +1003,7 @@ * NetBSD-style generic packet filter, pfil(9), hooks. * Enables ipf(8) in bridging. */ + if (!IPFW_LOADED) { /* XXX: Prevent ipfw from being run twice. */ if (inet_pfil_hook.ph_busy_count >= 0 && m0->m_pkthdr.len >= sizeof(struct ip) && ntohs(save_eh.ether_type) == ETHERTYPE_IP) { @@ -1029,6 +1030,7 @@ ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); } + } /* XXX: Prevent ipfw from being run twice. */ #endif /* PFIL_HOOKS */ /* ==== //depot/projects/hammer/sys/netgraph/ng_bridge.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.27 2004/07/20 17:15:37 julian Exp $ + * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.28 2004/08/17 22:05:53 andre Exp $ */ /* @@ -629,9 +629,11 @@ } /* Run packet through ipfw processing, if enabled */ +#if 0 if (priv->conf.ipfw[linkNum] && fw_enable && ip_fw_chk_ptr != NULL) { /* XXX not implemented yet */ } +#endif /* * If unicast and destination host known, deliver to host's link, ==== //depot/projects/hammer/sys/netinet/ip_divert.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 18 00:29:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32E0016A4D0; Wed, 18 Aug 2004 00:29:03 +0000 (GMT) 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 0E8A816A4CE for ; Wed, 18 Aug 2004 00:29:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 043F843D2F for ; Wed, 18 Aug 2004 00:29:03 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I0T2Xk020403 for ; Wed, 18 Aug 2004 00:29:02 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I0T2C1020400 for perforce@freebsd.org; Wed, 18 Aug 2004 00:29:02 GMT (envelope-from peter@freebsd.org) Date: Wed, 18 Aug 2004 00:29:02 GMT Message-Id: <200408180029.i7I0T2C1020400@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 59943 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: Wed, 18 Aug 2004 00:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=59943 Change 59943 by peter@peter_daintree on 2004/08/18 00:28:37 IFC @59942 (6.0-current!) Affected files ... .. //depot/projects/hammer/sys/conf/newvers.sh#12 integrate .. //depot/projects/hammer/sys/sys/param.h#41 integrate Differences ... ==== //depot/projects/hammer/sys/conf/newvers.sh#12 (text+ko) ==== @@ -28,10 +28,10 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.63 2004/08/18 00:21:12 scottl Exp $ TYPE="FreeBSD" -REVISION="5.2" +REVISION="6.0" BRANCH="CURRENT" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" ==== //depot/projects/hammer/sys/sys/param.h#41 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.209 2004/08/08 03:21:37 alfred Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.210 2004/08/18 00:21:12 scottl Exp $ */ #ifndef _SYS_PARAM_H_ @@ -55,7 +55,7 @@ * scheme is: <0 if release branch, otherwise 1>xx */ #undef __FreeBSD_version -#define __FreeBSD_version 502128 /* Master, propagated to newvers */ +#define __FreeBSD_version 600000 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Wed Aug 18 00:33:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D837716A4D1; Wed, 18 Aug 2004 00:33:08 +0000 (GMT) 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 9928516A4CE for ; Wed, 18 Aug 2004 00:33:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7925243D2D for ; Wed, 18 Aug 2004 00:33:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I0X8RU020523 for ; Wed, 18 Aug 2004 00:33:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I0X88q020520 for perforce@freebsd.org; Wed, 18 Aug 2004 00:33:08 GMT (envelope-from peter@freebsd.org) Date: Wed, 18 Aug 2004 00:33:08 GMT Message-Id: <200408180033.i7I0X88q020520@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 59944 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: Wed, 18 Aug 2004 00:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=59944 Change 59944 by peter@peter_daintree on 2004/08/18 00:32:47 revert the gcc-3.4 option removal Affected files ... .. //depot/projects/hammer/sys/conf/kern.pre.mk#29 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.pre.mk#29 (text+ko) ==== @@ -70,8 +70,8 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} -#CFLAGS+= --param inline-unit-growth=100 -#CFLAGS+= --param large-function-growth=1000 +CFLAGS+= --param inline-unit-growth=100 +CFLAGS+= --param large-function-growth=1000 WERROR?= -Werror .endif From owner-p4-projects@FreeBSD.ORG Wed Aug 18 00:36:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF2BA16A4D0; Wed, 18 Aug 2004 00:36:12 +0000 (GMT) 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 A94D716A4CE for ; Wed, 18 Aug 2004 00:36:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0FBB43D39 for ; Wed, 18 Aug 2004 00:36:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I0aC9b020648 for ; Wed, 18 Aug 2004 00:36:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I0aCGm020637 for perforce@freebsd.org; Wed, 18 Aug 2004 00:36:12 GMT (envelope-from peter@freebsd.org) Date: Wed, 18 Aug 2004 00:36:12 GMT Message-Id: <200408180036.i7I0aCGm020637@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 59945 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: Wed, 18 Aug 2004 00:36:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=59945 Change 59945 by peter@peter_melody on 2004/08/18 00:36:09 try and make this compile. yay. Affected files ... .. //depot/projects/hammer/sys/netinet/ip_output.c#34 edit Differences ... ==== //depot/projects/hammer/sys/netinet/ip_output.c#34 (text+ko) ==== @@ -132,7 +132,9 @@ struct in_ifaddr *ia = NULL; int isbroadcast, sw_csum; struct route iproute; +#ifdef PFIL_HOOKS struct in_addr odst; +#endif #ifdef IPFIREWALL_FORWARD struct m_tag *fwd_tag = NULL; #endif @@ -185,7 +187,9 @@ } dst = (struct sockaddr_in *)&ro->ro_dst; +#ifdef PFIL_HOOKS again: +#endif /* * If there is a cached route, * check that it is to the same destination From owner-p4-projects@FreeBSD.ORG Wed Aug 18 00:50:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D22E16A4D0; Wed, 18 Aug 2004 00:50:32 +0000 (GMT) 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 288C316A4CE for ; Wed, 18 Aug 2004 00:50:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08D7143D1D for ; Wed, 18 Aug 2004 00:50:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I0oVIu021030 for ; Wed, 18 Aug 2004 00:50:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I0oVkL021027 for perforce@freebsd.org; Wed, 18 Aug 2004 00:50:31 GMT (envelope-from peter@freebsd.org) Date: Wed, 18 Aug 2004 00:50:31 GMT Message-Id: <200408180050.i7I0oVkL021027@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 59948 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: Wed, 18 Aug 2004 00:50:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=59948 Change 59948 by peter@peter_daintree on 2004/08/18 00:49:36 add expected mp_grab_cpu_hlt() call Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#99 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#99 (text+ko) ==== @@ -498,6 +498,11 @@ cpu_idle(void) { +#ifdef SMP + if (mp_grab_cpu_hlt()) + return; +#endif + if (cpu_idle_hlt) { disable_intr(); if (sched_runnable()) From owner-p4-projects@FreeBSD.ORG Wed Aug 18 01:40:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47A5116A4D0; Wed, 18 Aug 2004 01:40:33 +0000 (GMT) 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 116EA16A4CE for ; Wed, 18 Aug 2004 01:40:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F257143D39 for ; Wed, 18 Aug 2004 01:40:32 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I1eWMI022452 for ; Wed, 18 Aug 2004 01:40:32 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I1eWMd022449 for perforce@freebsd.org; Wed, 18 Aug 2004 01:40:32 GMT (envelope-from wsalamon@computer.org) Date: Wed, 18 Aug 2004 01:40:32 GMT Message-Id: <200408180140.i7I1eWMd022449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 59949 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: Wed, 18 Aug 2004 01:40:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=59949 Change 59949 by wsalamon@wsalamon_epi on 2004/08/18 01:39:59 Audit the fchflags, fchmod, fchown, ftruncate, futimes, fstatfs, and getdirentries system calls. Note that auditing of these calls will show how vn_getpath() often does not succeed, and hence no path will be in the audit log. Also, the sys_au_event table in kern_bsm_klib.c is modified to match the above system calls for FreeBSD. However, many of the entries in this table need to be fixed, or the table replaced with something better (adding the audit event to the sysent table, for example?). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#3 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -279,8 +279,12 @@ struct statfs *sp, sb; int error; + AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + mp = fp->f_vnode->v_mount; fdrop(fp, td); if (mp == NULL) @@ -2393,8 +2397,13 @@ struct file *fp; int error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(fflags, uap->flags); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + error = setfflags(td, fp->f_vnode, uap->flags); fdrop(fp, td); return (error); @@ -2514,8 +2523,13 @@ struct file *fp; int error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(mode, uap->mode); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + error = setfmode(td, fp->f_vnode, uap->mode); fdrop(fp, td); return (error); @@ -2653,8 +2667,12 @@ struct file *fp; int error; + AUDIT_ARG(owner, uap->uid, uap->gid); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + error = setfown(td, fp->f_vnode, uap->uid, uap->gid); fdrop(fp, td); return (error); @@ -2846,10 +2864,14 @@ struct file *fp; int error; + AUDIT_ARG(fd, fd); + if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) + return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) - return (error); error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL); fdrop(fp, td); return (error); @@ -2942,10 +2964,14 @@ struct file *fp; int error; + AUDIT_ARG(fd, uap->fd); if (uap->length < 0) return(EINVAL); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + if ((fp->f_flag & FWRITE) == 0) { fdrop(fp, td); return (EINVAL); @@ -3561,8 +3587,12 @@ long loff; int error, eofflag; + AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); + + AUDIT_ARG(vnpath, fp->f_vnode, ARG_VNODE1); + if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); return (EBADF); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#6 (text+ko) ==== @@ -188,7 +188,7 @@ AUE_MKDIR, /* 136 = mkdir */ AUE_RMDIR, /* 137 = rmdir */ AUE_UTIMES, /* 138 = utimes */ - AUE_FUTIMES, /* 139 = futimes */ + AUE_NULL, /* 139 = obsolete 4.2 sigreturn */ AUE_ADJTIME, /* 140 = adjtime */ AUE_NULL, /* 141 = getpeername */ AUE_NULL, /* 142 = old gethostid */ @@ -206,8 +206,8 @@ AUE_NULL, /* 154 = pwrite */ AUE_NULL, /* 155 = nfs_svc */ AUE_O_GETDIRENTRIES, /* 156 = old getdirentries */ - AUE_STATFS, /* 157 = statfs */ - AUE_FSTATFS, /* 158 = fstatfs */ + AUE_NULL, /* 157 = old statfs */ + AUE_NULL, /* 158 = old fstatfs */ AUE_UMOUNT, /* 159 = unmount */ AUE_NULL, /* 160 was async_daemon */ AUE_GETFH, /* 161 = get file handle */ @@ -263,16 +263,16 @@ AUE_MLOCK, /* 203 = mlock */ AUE_MUNLOCK, /* 204 = munlock */ AUE_UNDELETE, /* 205 = undelete */ - AUE_NULL, /* 206 = ATsocket */ - AUE_NULL, /* 207 = ATgetmsg*/ - AUE_NULL, /* 208 = ATputmsg*/ - AUE_NULL, /* 209 = ATPsndreq*/ - AUE_NULL, /* 210 = ATPsndrsp*/ - AUE_NULL, /* 211 = ATPgetreq*/ - AUE_NULL, /* 212 = ATPgetrsp*/ - AUE_NULL, /* 213 = Reserved for AppleTalk */ - AUE_NULL, /* 214 = Reserved for AppleTalk */ - AUE_NULL, /* 215 = Reserved for AppleTalk */ + AUE_FUTIMES, /* 206 = futimes */ + AUE_NULL, /* 207 = */ + AUE_NULL, /* 208 = */ + AUE_NULL, /* 209 = */ + AUE_NULL, /* 210 = */ + AUE_NULL, /* 211 = */ + AUE_NULL, /* 212 = */ + AUE_NULL, /* 213 = for AppleTalk */ + AUE_NULL, /* 214 = for AppleTalk */ + AUE_NULL, /* 215 = for AppleTalk */ AUE_NULL, /* 216 = HFS make complex file call (multipel forks */ AUE_NULL, /* 217 = HFS statv extended stat call for HFS */ @@ -427,7 +427,37 @@ AUE_NULL, /* 366 */ AUE_NULL, /* 367 */ AUE_NULL, /* 368 */ - AUE_NULL /* 369 */ + AUE_NULL, /* 369 */ + AUE_NULL, /* 370 */ + AUE_NULL, /* 371 */ + AUE_NULL, /* 372 */ + AUE_NULL, /* 373 */ + AUE_NULL, /* 374 */ + AUE_NULL, /* 375 */ + AUE_NULL, /* 376 */ + AUE_NULL, /* 377 */ + AUE_NULL, /* 378 */ + AUE_NULL, /* 379 */ + AUE_NULL, /* 380 */ + AUE_NULL, /* 381 */ + AUE_NULL, /* 382 */ + AUE_NULL, /* 383 */ + AUE_NULL, /* 384 */ + AUE_NULL, /* 385 */ + AUE_NULL, /* 386 */ + AUE_NULL, /* 387 */ + AUE_NULL, /* 388 */ + AUE_NULL, /* 389 */ + AUE_NULL, /* 390 */ + AUE_NULL, /* 391 */ + AUE_NULL, /* 392 */ + AUE_NULL, /* 393 */ + AUE_NULL, /* 394 */ + AUE_NULL, /* 395 */ + AUE_STATFS, /* 396 = statfs */ + AUE_FSTATFS, /* 397 = fstafs */ + AUE_NULL, /* 398 */ + AUE_NULL /* 399 */ }; int nsys_au_event = sizeof(sys_au_event) / sizeof(sys_au_event[0]); From owner-p4-projects@FreeBSD.ORG Wed Aug 18 02:38:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD43E16A4D0; Wed, 18 Aug 2004 02:38:44 +0000 (GMT) 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 85CE116A4CE for ; Wed, 18 Aug 2004 02:38:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 650F643D3F for ; Wed, 18 Aug 2004 02:38:44 +0000 (GMT) (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.11/8.12.11) with ESMTP id i7I2cilC024128 for ; Wed, 18 Aug 2004 02:38:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I2chXQ024125 for perforce@freebsd.org; Wed, 18 Aug 2004 02:38:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 18 Aug 2004 02:38:43 GMT Message-Id: <200408180238.i7I2chXQ024125@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 59952 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: Wed, 18 Aug 2004 02:38:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=59952 Change 59952 by rwatson@rwatson_paprika on 2004/08/18 02:38:20 Integrate netperf_socket from FreeBSD CVS HEAD: Much MFi386 into amd64. ipfw, dummynet, et al, use PFIL_HOOKS (woo!). aic* driver fixups. netinet white space cleanup. psm sync bits fixup. 6.x-current. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#19 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#10 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#15 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#18 integrate .. //depot/projects/netperf_socket/sys/conf/files#48 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#7 integrate .. //depot/projects/netperf_socket/sys/conf/newvers.sh#4 integrate .. //depot/projects/netperf_socket/sys/conf/options#26 integrate .. //depot/projects/netperf_socket/sys/conf/options.ia64#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lock.c#4 integrate .. //depot/projects/netperf_socket/sys/modules/agp/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/ahc_isa/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/cbb/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/icmp_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/if_atm.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/if_atm.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/igmp.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw_pfil.c#1 branch .. //depot/projects/netperf_socket/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_id.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#21 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#8 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_debug.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcpip.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_var.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#7 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/locore.S#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/nexus.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/ofw_bus.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_bus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#17 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#24 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); #include #include @@ -40,8 +40,7 @@ { struct acpi_softc *sc; - sc = device_get_softc(dev); - + sc = devclass_get_softc(devclass_find("acpi"), 0); acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.56 2004/07/08 01:28:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.57 2004/08/16 22:53:03 peter Exp $"); #include #include @@ -526,7 +526,7 @@ if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) || dmat->boundary > 0 || dmat->alignment > 1) - && map->pagesneeded == 0) { + && map != &nobounce_dmamap && map->pagesneeded == 0) { vm_offset_t vendaddr; /* ==== //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.150 2004/05/16 22:43:57 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $ */ #include @@ -53,7 +53,7 @@ /* * cpu_throw() * - * This is the second half of cpu_swtch(). It is used when the current + * This is the second half of cpu_switch(). It is used when the current * thread is either a dummy or slated to die, and we no longer care * about its state. This is only a slight optimization and is probably * not worth it anymore. Note that we need to clear the pm_active bits so ==== //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.79 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.80 2004/08/16 23:10:46 peter Exp $"); /* * Interface to new debugger. @@ -33,11 +33,9 @@ #include #include #include -#include #include #include #include -#include #include ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#6 (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/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ */ /* @@ -212,8 +212,7 @@ * For stray and threaded interrupts, we mask and EOI the * source. */ - isrc->is_pic->pic_disable_source(isrc); - isrc->is_pic->pic_eoi_source(isrc); + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); if (ih == NULL) error = EINVAL; else ==== //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.10 2004/07/08 01:42:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -119,7 +119,7 @@ static const char *ioapic_bus_string(int bus_type); static void ioapic_print_vector(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); -static void ioapic_disable_source(struct intsrc *isrc); +static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); @@ -148,6 +148,12 @@ #endif TUNABLE_INT("hw.apic.mixed_mode", &mixed_mode_active); +static __inline void +_ioapic_eoi_source(struct intsrc *isrc) +{ + lapic_eoi(); +} + static u_int ioapic_read(volatile ioapic_t *apic, int reg) { @@ -225,7 +231,7 @@ } static void -ioapic_disable_source(struct intsrc *isrc) +ioapic_disable_source(struct intsrc *isrc, int eoi) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; @@ -240,6 +246,10 @@ flags); intpin->io_masked = 1; } + + if (eoi == PIC_EOI) + _ioapic_eoi_source(isrc); + mtx_unlock_spin(&icu_lock); } @@ -247,7 +257,7 @@ ioapic_eoi_source(struct intsrc *isrc) { - lapic_eoi(); + _ioapic_eoi_source(isrc); } /* ==== //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -51,7 +51,6 @@ static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device"); struct legacy_device { - struct resource_list lg_resources; int lg_pcibus; }; @@ -63,15 +62,8 @@ static int legacy_print_child(device_t, device_t); static device_t legacy_add_child(device_t bus, int order, const char *name, int unit); -static struct resource *legacy_alloc_resource(device_t, device_t, int, int *, - u_long, u_long, u_long, u_int); static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); static int legacy_write_ivar(device_t, device_t, int, uintptr_t); -static int legacy_release_resource(device_t, device_t, int, int, - struct resource *); -static int legacy_set_resource(device_t, device_t, int, int, u_long, u_long); -static int legacy_get_resource(device_t, device_t, int, int, u_long *, u_long *); -static void legacy_delete_resource(device_t, device_t, int, int); static device_method_t legacy_methods[] = { /* Device interface */ @@ -88,11 +80,8 @@ DEVMETHOD(bus_add_child, legacy_add_child), DEVMETHOD(bus_read_ivar, legacy_read_ivar), DEVMETHOD(bus_write_ivar, legacy_write_ivar), - DEVMETHOD(bus_set_resource, legacy_set_resource), - DEVMETHOD(bus_get_resource, legacy_get_resource), - DEVMETHOD(bus_alloc_resource, legacy_alloc_resource), - DEVMETHOD(bus_release_resource, legacy_release_resource), - DEVMETHOD(bus_delete_resource, legacy_delete_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -183,30 +172,12 @@ } static int -legacy_print_all_resources(device_t dev) -{ - struct legacy_device *atdev = DEVTOAT(dev); - struct resource_list *rl = &atdev->lg_resources; - int retval = 0; - - if (SLIST_FIRST(rl) || atdev->lg_pcibus != -1) - retval += printf(" at"); - - retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); - retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx"); - retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); - - return retval; -} - -static int legacy_print_child(device_t bus, device_t child) { struct legacy_device *atdev = DEVTOAT(child); int retval = 0; retval += bus_print_child_header(bus, child); - retval += legacy_print_all_resources(child); if (atdev->lg_pcibus != -1) retval += printf(" pcibus %d", atdev->lg_pcibus); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ @@ -224,7 +195,6 @@ M_NOWAIT | M_ZERO); if (atdev == NULL) return(NULL); - resource_list_init(&atdev->lg_resources); atdev->lg_pcibus = -1; child = device_add_child_ordered(bus, order, name, unit); @@ -268,66 +238,6 @@ return 0; } - -static struct resource * -legacy_alloc_resource(device_t bus, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - return (resource_list_alloc(rl, bus, child, type, rid, start, end, - count, flags)); -} - -static int -legacy_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - return (resource_list_release(rl, bus, child, type, rid, r)); -} - -static int -legacy_set_resource(device_t dev, device_t child, int type, int rid, - u_long start, u_long count) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - resource_list_add(rl, type, rid, start, start + count - 1, count); - return(0); -} - -static int -legacy_get_resource(device_t dev, device_t child, int type, int rid, - u_long *startp, u_long *countp) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - struct resource_list_entry *rle; - - rle = resource_list_find(rl, type, rid); - if (!rle) - return(ENOENT); - if (startp) - *startp = rle->start; - if (countp) - *countp = rle->count; - return(0); -} - -static void -legacy_delete_resource(device_t dev, device_t child, int type, int rid) -{ - struct legacy_device *atdev = DEVTOAT(child); - struct resource_list *rl = &atdev->lg_resources; - - resource_list_delete(rl, type, rid); -} - /* * Legacy CPU attachment when ACPI is not available. Drivers like * cpufreq(4) hang off this. ==== //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.9 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.10 2004/08/16 22:55:32 peter Exp $"); #include #include @@ -194,7 +194,7 @@ { int i; - if (apic_id > MAX_APICID) { + if (apic_id >= MAX_APICID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.617 2004/08/10 12:15:27 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.618 2004/08/16 22:57:47 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -95,6 +95,11 @@ #include #include +#ifdef DDB +#ifndef KDB +#error KDB must be enabled in order for DDB to work! +#endif +#endif #include #include ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.278 2004/08/09 23:57:59 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.279 2004/08/16 22:56:20 peter Exp $"); /* * AMD64 Trap and System call handling @@ -286,7 +286,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap (type, 0, &frame); + kdb_trap(type, 0, &frame); } #endif /* KDB */ goto userout; @@ -747,6 +747,9 @@ ktrsyscall(code, narg, argp); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -810,6 +813,9 @@ */ userret(td, &frame, sticks); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.236 2004/08/11 23:23:05 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -314,6 +314,7 @@ * Set the trap frame to point at the beginning of the uts * function. */ + td->td_frame->tf_rbp = 0; td->td_frame->tf_rsp = ((register_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#15 (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.420 2004/08/16 12:51:32 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.421 2004/08/16 22:59:24 peter Exp $ machine amd64 cpu HAMMER @@ -58,6 +58,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. options PFIL_HOOKS # pfil(9) framework +options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -149,7 +150,6 @@ # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge -#device pcic # ExCA ISA and PCI bridges device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus ==== //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.3 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.4 2004/08/16 23:12:30 peter Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -50,7 +50,7 @@ */ struct pic { void (*pic_enable_source)(struct intsrc *); - void (*pic_disable_source)(struct intsrc *); + void (*pic_disable_source)(struct intsrc *, int); void (*pic_eoi_source)(struct intsrc *); void (*pic_enable_intr)(struct intsrc *); int (*pic_vector)(struct intsrc *); @@ -61,6 +61,12 @@ enum intr_polarity); }; +/* Flags for pic_disable_source() */ +enum { + PIC_EOI, + PIC_NO_EOI, +}; + /* * An interrupt source. The upper-layer code uses the PIC methods to * control a given source. The lower-layer PIC drivers can store additional ==== //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.12 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.13 2004/08/16 23:12:30 peter Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -140,7 +140,7 @@ }; static void atpic_enable_source(struct intsrc *isrc); -static void atpic_disable_source(struct intsrc *isrc); +static void atpic_disable_source(struct intsrc *isrc, int eoi); static void atpic_eoi_master(struct intsrc *isrc); static void atpic_eoi_slave(struct intsrc *isrc); static void atpic_enable_intr(struct intsrc *isrc); @@ -177,6 +177,35 @@ CTASSERT(sizeof(atintrs) / sizeof(atintrs[0]) == NUM_ISA_IRQS); +static __inline void +_atpic_eoi_master(struct intsrc *isrc) +{ + + KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, + ("%s: mismatched pic", __func__)); +#ifndef AUTO_EOI_1 + outb(atpics[MASTER].at_ioaddr, OCW2_EOI); +#endif +} + +/* + * The data sheet says no auto-EOI on slave, but it sometimes works. + * So, if AUTO_EOI_2 is enabled, we use it. + */ +static __inline void +_atpic_eoi_slave(struct intsrc *isrc) +{ + + KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, + ("%s: mismatched pic", __func__)); +#ifndef AUTO_EOI_2 + outb(atpics[SLAVE].at_ioaddr, OCW2_EOI); +#ifndef AUTO_EOI_1 + outb(atpics[MASTER].at_ioaddr, OCW2_EOI); +#endif +#endif +} + static void atpic_enable_source(struct intsrc *isrc) { @@ -192,48 +221,48 @@ } static void -atpic_disable_source(struct intsrc *isrc) +atpic_disable_source(struct intsrc *isrc, int eoi) { struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; struct atpic *ap = (struct atpic *)isrc->is_pic; - if (ai->at_trigger == INTR_TRIGGER_EDGE) - return; mtx_lock_spin(&icu_lock); - *ap->at_imen |= IMEN_MASK(ai); - outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); + if (ai->at_trigger != INTR_TRIGGER_EDGE) { + *ap->at_imen |= IMEN_MASK(ai); + outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); + } + + /* + * Take care to call these functions directly instead of through + * a function pointer. All of the referenced variables should + * still be hot in the cache. + */ + if (eoi == PIC_EOI) { + if (isrc->is_pic == &atpics[MASTER].at_pic) + _atpic_eoi_master(isrc); + else + _atpic_eoi_slave(isrc); + } + mtx_unlock_spin(&icu_lock); } static void atpic_eoi_master(struct intsrc *isrc) { - - KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, - ("%s: mismatched pic", __func__)); #ifndef AUTO_EOI_1 mtx_lock_spin(&icu_lock); - outb(atpics[MASTER].at_ioaddr, OCW2_EOI); + _atpic_eoi_master(isrc); mtx_unlock_spin(&icu_lock); #endif } -/* - * The data sheet says no auto-EOI on slave, but it sometimes works. - * So, if AUTO_EOI_2 is enabled, we use it. - */ static void atpic_eoi_slave(struct intsrc *isrc) { - - KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, - ("%s: mismatched pic", __func__)); #ifndef AUTO_EOI_2 mtx_lock_spin(&icu_lock); - outb(atpics[SLAVE].at_ioaddr, OCW2_EOI); -#ifndef AUTO_EOI_1 - outb(atpics[MASTER].at_ioaddr, OCW2_EOI); -#endif + _atpic_eoi_slave(isrc); mtx_unlock_spin(&icu_lock); #endif } ==== //depot/projects/netperf_socket/sys/amd64/isa/clock.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.213 2004/07/11 18:07:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.214 2004/08/16 22:52:02 peter Exp $"); /* * Routines to handle clock hardware. @@ -212,6 +212,7 @@ static void rtcintr(struct clockframe *frame) { + while (rtcin(RTC_INTR) & RTCIR_PERIOD) { if (profprocs != 0) { if (--pscnt == 0) @@ -295,7 +296,7 @@ * multiplications and divisions to scale the count take a while). * * However, if ddb is active then use a fake counter since reading - * the i8254 counter involves acquiring a lock. ddb must not go + * the i8254 counter involves acquiring a lock. ddb must not do * locking for many reasons, but it calls here for at least atkbd * input. */ ==== //depot/projects/netperf_socket/sys/amd64/isa/isa.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.25 2004/04/05 21:25:52 imp Exp $ + * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.26 2004/08/16 22:51:44 peter Exp $ */ #ifndef _I386_ISA_ISA_H_ @@ -64,69 +64,9 @@ #define IO_NPX 0x0F0 /* Numeric Coprocessor */ /* Cards */ - /* 0x100 - 0x16F Open */ - -#define IO_WD2 0x170 /* Secondary Fixed Disk Controller */ - -#define IO_PMP2 0x178 /* 82347 Power Management Peripheral */ - - /* 0x17A - 0x1EF Open */ - -#define IO_WD1 0x1F0 /* Primary Fixed Disk Controller */ -#define IO_GAME 0x201 /* Game Controller */ - - /* 0x202 - 0x22A Open */ - -#define IO_ASC2 0x22B /* AmiScan addr.grp. 2 */ - - /* 0x230 - 0x26A Open */ - -#define IO_ASC3 0x26B /* AmiScan addr.grp. 3 */ -#define IO_GSC1 0x270 /* -- 0x27B! GeniScan GS-4500 addr.grp. 1 */ -#define IO_LPT2 0x278 /* Parallel Port #2 */ - - /* 0x280 - 0x2AA Open */ - -#define IO_ASC4 0x2AB /* AmiScan addr.grp. 4 */ - - /* 0x2B0 - 0x2DF Open */ - -#define IO_GSC2 0x2E0 /* GeniScan GS-4500 addr.grp. 2 */ -#define IO_COM4 0x2E8 /* COM4 i/o address */ -#define IO_ASC5 0x2EB /* AmiScan addr.grp. 5 */ - - /* 0x2F0 - 0x2F7 Open */ - -#define IO_COM2 0x2F8 /* COM2 i/o address */ - - /* 0x300 - 0x32A Open */ - -#define IO_ASC6 0x32B /* AmiScan addr.grp. 6 */ -#define IO_AHA0 0x330 /* adaptec 1542 default addr. */ -#define IO_BT0 0x330 /* bustek 742a default addr. */ -#define IO_UHA0 0x330 /* ultrastore 14f default addr. */ -#define IO_AHA1 0x334 /* adaptec 1542 default addr. */ -#define IO_BT1 0x334 /* bustek 742a default addr. */ - - /* 0x340 - 0x36A Open */ - -#define IO_ASC7 0x36B /* AmiScan addr.grp. 7 */ -#define IO_GSC3 0x370 /* GeniScan GS-4500 addr.grp. 3 */ -#define IO_FD2 0x370 /* secondary base i/o address */ -#define IO_LPT1 0x378 /* Parallel Port #1 */ - - /* 0x380 - 0x3AA Open */ - -#define IO_ASC8 0x3AB /* AmiScan addr.grp. 8 */ -#define IO_MDA 0x3B0 /* Monochome Adapter */ -#define IO_LPT3 0x3BC /* Monochome Adapter Printer Port */ #define IO_VGA 0x3C0 /* E/VGA Ports */ #define IO_CGA 0x3D0 /* CGA Ports */ -#define IO_GSC4 0x3E0 /* GeniScan GS-4500 addr.grp. 4 */ -#define IO_COM3 0x3E8 /* COM3 i/o address */ -#define IO_ASC1 0x3EB /* AmiScan addr.grp. 1 */ -#define IO_FD1 0x3F0 /* primary base i/o address */ -#define IO_COM1 0x3F8 /* COM1 i/o address */ +#define IO_MDA 0x3B0 /* Monochome Adapter */ #define IO_ISAEND 0x3FF /* End (actually Max) of I/O Regs */ #endif /* !IO_ISABEGIN */ @@ -138,25 +78,10 @@ #ifndef IO_ISASIZES #define IO_ISASIZES -#define IO_ASCSIZE 5 /* AmiScan GI1904-based hand scanner */ #define IO_CGASIZE 12 /* CGA controllers */ -#define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ -#define IO_DMASIZE 16 /* 8237 DMA controllers */ -#define IO_DPGSIZE 32 /* 74LS612 DMA page registers */ -#define IO_FDCSIZE 8 /* Nec765 floppy controllers */ -#define IO_GAMSIZE 16 /* AT compatible game controllers */ -#define IO_GSCSIZE 8 /* GeniScan GS-4500G hand scanner */ -#define IO_ICUSIZE 16 /* 8259A interrupt controllers */ -#define IO_KBDSIZE 16 /* 8042 Keyboard controllers */ -#define IO_LPTSIZE 8 /* LPT controllers, some use only 4 */ #define IO_MDASIZE 12 /* Monochrome display controllers */ #define IO_NPXSIZE 16 /* 80387/80487 NPX registers */ -#define IO_PMPSIZE 2 /* 82347 power management peripheral */ -#define IO_PSMSIZE 5 /* 8042 Keyboard controllers */ -#define IO_RTCSIZE 16 /* CMOS real time clock, NMI control */ -#define IO_TMRSIZE 16 /* 8253 programmable timers */ #define IO_VGASIZE 16 /* VGA controllers */ -#define IO_WDCSIZE 8 /* WD compatible disk controllers */ #endif /* !IO_ISASIZES */ ==== //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.18 2004/04/05 21:25:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $"); /* * code to manage AT bus @@ -103,12 +103,20 @@ { void *buf; + /* + * If a DMA channel is shared, both drivers have to call isa_dmainit + * since they don't know that the other driver will do it. + * Just return if we're already set up good. + * XXX: this only works if they agree on the bouncebuf size. This + * XXX: is typically the case since they are multiple instances of + * XXX: the same driver. + */ + if (dma_bouncebuf[chan] != NULL) + return; + #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) panic("isa_dmainit: channel out of range"); - - if (dma_bouncebuf[chan] != NULL) - panic("isa_dmainit: impossible request"); #endif dma_bouncebufsize[chan] = bouncebufsize; ==== //depot/projects/netperf_socket/sys/boot/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.23 2004/05/16 00:19:12 cognet Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.24 2004/08/16 15:45:24 marius Exp $ .if !defined(NOFORTH) # Build the add-in FORTH interpreter. SUBDIR+= ficl .endif -# Build OpenFirmware library. +# Build Open Firmware library. .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" SUBDIR+= ofw .endif ==== //depot/projects/netperf_socket/sys/boot/ofw/common/main.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.6 2004/08/02 03:05:09 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.7 2004/08/16 15:45:24 marius Exp $"); #include #include "openfirm.h" @@ -102,7 +102,7 @@ char **bargv; /* - * Initalise the OpenFirmware routines by giving them the entry point. + * Initalise the Open Firmware routines by giving them the entry point. */ OF_init(openfirm); ==== //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_console.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.8 2004/01/04 23:27:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.9 2004/08/16 15:45:25 marius Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 18 16:48:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 501D916A4D0; Wed, 18 Aug 2004 16:48:05 +0000 (GMT) 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 EC98516A4CE for ; Wed, 18 Aug 2004 16:48:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7F4743D2D for ; Wed, 18 Aug 2004 16:48:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7IGm4db063451 for ; Wed, 18 Aug 2004 16:48:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7IGm48I063448 for perforce@freebsd.org; Wed, 18 Aug 2004 16:48:04 GMT (envelope-from jhb@freebsd.org) Date: Wed, 18 Aug 2004 16:48:04 GMT Message-Id: <200408181648.i7IGm48I063448@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 60000 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: Wed, 18 Aug 2004 16:48:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=60000 Change 60000 by jhb@jhb_slimer on 2004/08/18 16:47:14 Redo the UP spin lock optimization but do it simpler (fewer ifdefs) and have it preserve mtx_lock's value so that mtx_owned() still works. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#84 edit .. //depot/projects/smpng/sys/sys/mutex.h#45 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#84 (text+ko) ==== @@ -354,11 +354,7 @@ m->mtx_object.lo_name, file, line)); WITNESS_CHECKORDER(&m->mtx_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, file, line); -#if defined(SMP) || LOCK_DEBUG > 0 || 1 _get_spin_lock(m, curthread, opts, file, line); -#else - critical_enter(); -#endif LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); @@ -376,11 +372,7 @@ LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); mtx_assert(m, MA_OWNED); -#if defined(SMP) || LOCK_DEBUG > 0 || 1 _rel_spin_lock(m); -#else - critical_exit(); -#endif } /* @@ -555,6 +547,7 @@ return; } +#ifdef SMP /* * _mtx_lock_spin: the tougher part of acquiring an MTX_SPIN lock. * @@ -602,6 +595,7 @@ return; } +#endif /* SMP */ /* * _mtx_unlock_sleep: the tougher part of releasing an MTX_DEF lock. ==== //depot/projects/smpng/sys/sys/mutex.h#45 (text+ko) ==== @@ -103,8 +103,10 @@ void _mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, const char *file, int line); void _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line); +#ifdef SMP void _mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file, int line); +#endif void _mtx_unlock_spin(struct mtx *m, int opts, const char *file, int line); int _mtx_trylock(struct mtx *m, int opts, const char *file, int line); void _mtx_lock_flags(struct mtx *m, int opts, const char *file, int line); @@ -161,6 +163,7 @@ * a deal. */ #ifndef _get_spin_lock +#ifdef SMP #define _get_spin_lock(mp, tid, opts, file, line) do { \ struct thread *_tid = (tid); \ \ @@ -172,6 +175,17 @@ _mtx_lock_spin((mp), _tid, (opts), (file), (line)); \ } \ } while (0) +#else /* SMP */ +#define _get_spin_lock(mp, tid, opts, file, line) do { \ + struct thread *_tid = (tid); \ + \ + critical_enter(); \ + if ((mp)->mtx_lock == (uintptr_t)_tid) \ + (mp)->mtx_recurse++; \ + else \ + (mp)->mtx_lock = (uintptr_t)_tid; \ +} while (0) +#endif /* SMP */ #endif /* @@ -196,6 +210,7 @@ * releasing a spin lock. This includes the recursion cases. */ #ifndef _rel_spin_lock +#ifdef SMP #define _rel_spin_lock(mp) do { \ if (mtx_recursed((mp))) \ (mp)->mtx_recurse--; \ @@ -203,6 +218,15 @@ _release_lock_quick((mp)); \ critical_exit(); \ } while (0) +#else /* SMP */ +#define _rel_spin_lock(mp) do { \ + if (mtx_recursed((mp))) \ + (mp)->mtx_recurse--; \ + else \ + (mp)->mtx_lock = MTX_UNOWNED; \ + critical_exit(); \ +} while (0) +#endif /* SMP */ #endif /* @@ -283,15 +307,10 @@ _get_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _rel_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) -#ifndef SMPnotyet #define mtx_lock_spin_flags(m, opts) \ _get_spin_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ _rel_spin_lock((m)) -#else /* SMP */ -#define mtx_lock_spin_flags(m, opts) critical_enter() -#define mtx_unlock_spin_flags(m, opts) critical_exit() -#endif /* SMP */ #endif /* LOCK_DEBUG > 0 || MUTEX_NOINLINE */ #define mtx_trylock_flags(m, opts) \ From owner-p4-projects@FreeBSD.ORG Thu Aug 19 02:05:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1D7C16A4D0; Thu, 19 Aug 2004 02:05:18 +0000 (GMT) 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 9279E16A4CE for ; Thu, 19 Aug 2004 02:05:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89A5143D73 for ; Thu, 19 Aug 2004 02:05:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7J25IXl007387 for ; Thu, 19 Aug 2004 02:05:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7J25Ij8007384 for perforce@freebsd.org; Thu, 19 Aug 2004 02:05:18 GMT (envelope-from peter@freebsd.org) Date: Thu, 19 Aug 2004 02:05:18 GMT Message-Id: <200408190205.i7J25Ij8007384@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 60029 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: Thu, 19 Aug 2004 02:05:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=60029 Change 60029 by peter@peter_daintree on 2004/08/19 02:04:36 For a 32 bit time_t machine, the representable years range from approx 1902 through 2038. Nothing has to worry about negative tm_year values. Lots of funny things happened to the calendar over the preceding few centuries that are not covered in the time system here. However, 64 bit time_t systems can represent tm_year for the next few billion years without an overflow. And it is signed, so theoretically it can represent 1900+year for the last few billion years. But, we dont have the calendar munging so this is of little value. So, clamp the tm_year values as >= 0, both for POLA and as a convenient safety test. A totally null 'struct tm' is 'jan 0, 1900, 00:00:00'. But there isn't a 0th day in the month, so it is normalized to 'dec 31, 1899, 00:00:00'. Adding the < 0 test means we catch this input value which is fairly likely to have been bogus from the start. Affected files ... .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/stdtime/localtime.c#6 (text+ko) ==== @@ -1487,6 +1487,9 @@ } if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE)) return WRONG; + /* Don't go below 1900 for POLA */ + if (yourtm.tm_year < 0) + return WRONG; if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN) saved_seconds = 0; else if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) { From owner-p4-projects@FreeBSD.ORG Thu Aug 19 02:48:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F67516A4D0; Thu, 19 Aug 2004 02:48:11 +0000 (GMT) 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 4424216A4CE for ; Thu, 19 Aug 2004 02:48:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25CE743D31 for ; Thu, 19 Aug 2004 02:48:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7J2mB2I008601 for ; Thu, 19 Aug 2004 02:48:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7J2mAg8008598 for perforce@freebsd.org; Thu, 19 Aug 2004 02:48:10 GMT (envelope-from peter@freebsd.org) Date: Thu, 19 Aug 2004 02:48:10 GMT Message-Id: <200408190248.i7J2mAg8008598@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 60031 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: Thu, 19 Aug 2004 02:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=60031 Change 60031 by peter@peter_daintree on 2004/08/19 02:47:49 IFC @60030 Affected files ... .. //depot/projects/hammer/Makefile#23 integrate .. //depot/projects/hammer/Makefile.inc1#57 integrate .. //depot/projects/hammer/contrib/lukemftpd/libnetbsd/strsuftoll.c#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpusers.5#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/logutmp.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/logwtmp.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/pathnames.h#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#18 integrate .. //depot/projects/hammer/lib/csu/ia64/crt1.S#3 integrate .. //depot/projects/hammer/lib/libc/gen/tls.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#9 integrate .. //depot/projects/hammer/release/Makefile#52 integrate .. //depot/projects/hammer/release/powerpc/boot.tbxi#1 branch .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#1 branch .. //depot/projects/hammer/release/powerpc/hfs.map#1 branch .. //depot/projects/hammer/release/powerpc/mkisoimages.sh#1 branch .. //depot/projects/hammer/release/scripts/doFS.sh#15 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/Makefile#2 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#1 branch .. //depot/projects/hammer/sbin/geom/class/raid3/Makefile#2 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.8#5 integrate .. //depot/projects/hammer/share/examples/mdoc/example.4#2 integrate .. //depot/projects/hammer/sys/boot/common/help.common#7 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#14 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/hammer/sys/conf/options.pc98#23 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#45 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#33 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#17 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#9 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#20 integrate .. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#7 integrate .. //depot/projects/hammer/sys/dev/twa/twa_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#14 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#8 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxreg.h#3 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxvar.h#3 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#19 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#5 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/hammer/sys/modules/Makefile#51 integrate .. //depot/projects/hammer/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#28 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#35 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/hammer/sys/sys/param.h#42 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#20 integrate .. //depot/projects/hammer/usr.bin/make/make.1#14 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#9 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#8 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#12 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#6 integrate Differences ... ==== //depot/projects/hammer/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.306 2004/08/09 11:38:41 harti Exp $ +# $FreeBSD: src/Makefile,v 1.308 2004/08/18 07:17:01 ru Exp $ # # The user-driven targets are: # @@ -85,6 +85,12 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj +_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy +.if !empty(_MAKEOBJDIRPREFIX) +.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ + (in /etc/make.conf) or command-line variable. +.endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ @@ -144,10 +150,9 @@ # Set a reasonable default .MAIN: all +STARTTIME!= LC_ALL=C date + .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) -.if make(world) -STARTTIME!= LC_ALL=C date -.endif # # world # @@ -242,16 +247,20 @@ # universe # # Attempt to rebuild *everything* for all supported architectures, -# with reasonable chance of success, regardless of how old your +# with a reasonable chance of success, regardless of how old your # existing system is. # -i386_mach= pc98 -universe: +universe: universe_prologue +universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for arch in i386 sparc64 alpha ia64 amd64 -.for mach in ${arch} ${${arch}_mach} +.for target in i386 i386:pc98 sparc64 alpha ia64 amd64 +.for arch in ${target:C/:.*$//} +.for mach in ${target:C/^.*://} +universe: universe_${mach} +.ORDER: universe_prologue universe_${mach} universe_epilogue +universe_${mach}: @echo ">> ${mach} started on `LC_ALL=C date`" -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ TARGET_ARCH=${arch} TARGET=${mach} \ @@ -262,10 +271,13 @@ -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ > ${.CURDIR}/_.${mach}.makeLINT 2>&1 .endif - cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernels TARGET_ARCH=${arch} TARGET=${mach} + cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach} @echo ">> ${mach} completed on `LC_ALL=C date`" .endfor .endfor +.endfor +universe: universe_epilogue +universe_epilogue: @echo "--------------------------------------------------------------" @echo ">>> make universe completed on `LC_ALL=C date`" @echo " (started ${STARTTIME})" @@ -274,8 +286,6 @@ .if make(buildkernels) KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 ! -name NOTES -.endif - buildkernels: .for kernel in ${KERNCONFS} -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ @@ -283,3 +293,4 @@ __MAKE_CONF=/dev/null \ > _.${TARGET}.${kernel} 2>&1 .endfor +.endif ==== //depot/projects/hammer/Makefile.inc1#57 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.438 2004/08/16 18:17:14 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.440 2004/08/18 13:21:40 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -90,13 +90,6 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ - -f /dev/null -V MAKEOBJDIRPREFIX dummy -.if !empty(_MAKEOBJDIRPREFIX) -.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. -.endif - .if !defined(OSRELDATE) .if exists(/usr/include/osreldate.h) OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ @@ -788,7 +781,6 @@ bin/csh \ bin/sh \ ${_rescue} \ - gnu/usr.bin/cc/cc_tools \ lib/libncurses \ ${_share} \ ${_aicasm} \ @@ -801,6 +793,7 @@ ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor .for _tool in \ + gnu/usr.bin/cc/cc_tools \ ${_kerberos5_tools} ${_+_}@${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/hammer/contrib/lukemftpd/libnetbsd/strsuftoll.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $NetBSD: strsuftoll.c,v 1.1 2002/11/29 12:58:17 lukem Exp $ */ +/* $NetBSD: strsuftoll.c,v 1.5 2004/01/17 23:02:51 dbj Exp $ */ /*- - * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. + * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -50,11 +50,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -71,20 +67,20 @@ * SUCH DAMAGE. */ +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: strsuftoll.c,v 1.1 2002/11/29 12:58:17 lukem Exp $"); +__RCSID("$NetBSD: strsuftoll.c,v 1.5 2004/01/17 23:02:51 dbj Exp $"); #endif /* LIBC_SCCS and not lint */ #ifdef _LIBC #include "namespace.h" #endif -#if HAVE_CONFIG_H -#include "config.h" -#endif - #if !HAVE_STRSUFTOLL #include @@ -100,16 +96,11 @@ #include #ifdef _LIBC -# define _STRSUFTOLL _strsuftoll -# define _STRSUFTOLLX _strsuftollx # ifdef __weak_alias __weak_alias(strsuftoll, _strsuftoll) __weak_alias(strsuftollx, _strsuftollx) # endif -#else /* !LIBC */ -# define _STRSUFTOLL strsuftoll -# define _STRSUFTOLLX strsuftollx -#endif /* !LIBC */ +#endif /* LIBC */ /* * Convert an expression of the following forms to a (u)int64_t. @@ -117,8 +108,10 @@ * 2) A positive decimal number followed by a b (mult by 512). * 3) A positive decimal number followed by a k (mult by 1024). * 4) A positive decimal number followed by a m (mult by 1048576). - * 5) A positive decimal number followed by a w (mult by sizeof int) - * 6) Two or more positive decimal numbers (with/without k,b or w). + * 5) A positive decimal number followed by a g (mult by 1073741824). + * 6) A positive decimal number followed by a t (mult by 1099511627776). + * 7) A positive decimal number followed by a w (mult by sizeof int) + * 8) Two or more positive decimal numbers (with/without k,b or w). * separated by x (also * for backwards compatibility), specifying * the product of the indicated values. * Returns the result upon successful conversion, or exits with an @@ -127,7 +120,7 @@ */ /* LONGLONG */ long long -_STRSUFTOLL(const char *desc, const char *val, +strsuftoll(const char *desc, const char *val, long long min, long long max) { long long result; @@ -145,7 +138,7 @@ */ /* LONGLONG */ long long -_STRSUFTOLLX(const char *desc, const char *val, +strsuftollx(const char *desc, const char *val, long long min, long long max, char *ebuf, size_t ebuflen) { long long num, t; @@ -161,7 +154,7 @@ while (isspace((unsigned char)*val)) /* Skip leading space */ val++; - num = strtoll(val, &expr, 0); + num = strtoll(val, &expr, 10); if (errno == ERANGE) goto erange; /* Overflow */ @@ -244,7 +237,7 @@ /* LONGLONG */ snprintf(ebuf, ebuflen, "%s %lld is greater than %lld.", - desc, (long long)num, (long long)min); + desc, (long long)num, (long long)max); return (0); } *ebuf = '\0'; ==== //depot/projects/hammer/contrib/lukemftpd/src/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2002/08/22 00:09:38 christos Exp $ +# $NetBSD: Makefile,v 1.51 2003-07-23 08:01:27 itojun Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 .include @@ -28,19 +28,24 @@ ftpd.o ftpcmd.o: version.h -# XXX Kerberos support is broken right now. +#.if (${USE_KERBEROS} != "no") +# #.PATH: ${NETBSDSRCDIR}/usr.bin/login - -#.ifdef KERBEROS5 +# #SRCS+= k5login.c #CPPFLAGS+=-DKERBEROS5 -#DPADD+= ${LIBKRB5} ${LIBK5CRYPTO} ${LIBCOM_ERR} -#LDADD+= -lkrb5 -lk5crypto -lcom_err -#.else -#SRCS+= klogin.c -#CPPFLAGS+=-DKERBEROS -#DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} -#LDADD+= -lkrb -kdes -lcom_err +#CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5 +#DPADD+= ${LIBKRB5} ${LIBASN1} +#LDADD+= -lkrb5 -lasn1 +# +#SRCS+= klogin.c +#CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV +#DPADD+= ${LIBKRB} +#LDADD+= -lkrb +# +#DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR} +#LDADD+= -lcrypto -lroken -lcom_err +# #.endif .include ==== //depot/projects/hammer/contrib/lukemftpd/src/cmds.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $ */ +/* $NetBSD: cmds.c,v 1.23 2004-08-09 12:56:47 lukem Exp $ */ /* - * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. + * Copyright (c) 1999-2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -48,11 +48,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -101,7 +97,7 @@ #include #ifndef lint -__RCSID("$NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.23 2004-08-09 12:56:47 lukem Exp $"); #endif /* not lint */ #include @@ -111,7 +107,6 @@ #include #include -#include #include #include #include @@ -812,7 +807,7 @@ mlsname(FILE *fp, factelem *fe) { char realfile[MAXPATHLEN]; - int i, userf; + int i, userf = 0; for (i = 0; i < FACTTABSIZE; i++) { if (facttab[i].enabled) ==== //depot/projects/hammer/contrib/lukemftpd/src/conf.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: conf.c,v 1.50 2002/11/16 03:10:34 itojun Exp $ */ +/* $NetBSD: conf.c,v 1.52 2004-08-09 12:56:47 lukem Exp $ */ /*- - * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. + * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: conf.c,v 1.50 2002/11/16 03:10:34 itojun Exp $"); +__RCSID("$NetBSD: conf.c,v 1.52 2004-08-09 12:56:47 lukem Exp $"); #endif /* not lint */ #include @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/hammer/contrib/lukemftpd/src/extern.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.44 2002/05/30 00:24:47 enami Exp $ */ +/* $NetBSD: extern.h,v 1.50 2004-08-09 12:56:47 lukem Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,7 +32,7 @@ */ /*- - * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. + * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -147,9 +143,6 @@ void init_curclass(void); void logxfer(const char *, off_t, const char *, const char *, const struct timeval *, const char *); -#if 0 -void logwtmp(const char *, const char *, const char *); -#endif struct tab *lookup(struct tab *, const char *); void makedir(const char *); void mlsd(const char *); @@ -184,6 +177,21 @@ char *xstrdup(const char *); void yyerror(char *); +#ifdef SUPPORT_UTMP +struct utmp; + +void ftpd_logwtmp(const char *, const char *, const char *); +void ftpd_login(const struct utmp *ut); +int ftpd_logout(const char *line); +#endif + +#ifdef SUPPORT_UTMPX +struct utmpx; + +void ftpd_loginx(const struct utmpx *); +void ftpd_logwtmpx(const char *, const char *, const char *, int, int); +#endif + #include #if defined(__NetBSD__) @@ -302,11 +310,10 @@ GLOBAL int connections; GLOBAL struct ftpclass curclass; GLOBAL int debug; -GLOBAL jmp_buf errcatch; GLOBAL char *emailaddr; GLOBAL int form; GLOBAL int gidcount; /* number of entries in gidlist[] */ -GLOBAL gid_t gidlist[NGROUPS_MAX]; +GLOBAL gid_t *gidlist; GLOBAL int hasyyerrored; GLOBAL char hostname[MAXHOSTNAMELEN+1]; GLOBAL char homedir[MAXPATHLEN]; @@ -324,7 +331,6 @@ GLOBAL char remotehost[MAXHOSTNAMELEN+1]; GLOBAL off_t restart_point; GLOBAL char tmpline[FTP_BUFLEN]; -GLOBAL sig_atomic_t transflag; GLOBAL int type; GLOBAL int usedefault; /* for data transfers */ GLOBAL const char *version; ==== //depot/projects/hammer/contrib/lukemftpd/src/ftpcmd.y#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.80 2004-08-09 12:56:47 lukem Exp $ */ /*- - * Copyright (c) 1997-2002 The NetBSD Foundation, Inc. + * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -48,11 +48,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -83,7 +79,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.80 2004-08-09 12:56:47 lukem Exp $"); #endif #endif /* not lint */ @@ -98,8 +94,6 @@ #include #include #include -#include -#include #include #include #include @@ -128,7 +122,7 @@ %union { struct { - off_t o; + LLT ll; int i; } u; char *s; @@ -138,7 +132,7 @@ A B C E F I L N P R S T - SP CRLF COMMA + SP CRLF COMMA ALL USER PASS ACCT CWD CDUP SMNT QUIT REIN PORT PASV TYPE STRU @@ -164,7 +158,6 @@ LEXERR %token STRING -%token ALL %token NUMBER %type check_login octal_number byte_size @@ -179,7 +172,7 @@ cmd_sel : cmd { - fromname = NULL; + REASSIGN(fromname, NULL); restart_point = (off_t) 0; } @@ -459,8 +452,7 @@ if (check_write($3, 0)) { if (fromname) { renamecmd(fromname, $3); - free(fromname); - fromname = NULL; + REASSIGN(fromname, NULL); } else { reply(503, "Bad sequence of commands."); } @@ -548,7 +540,7 @@ | SITE SP CHMOD SP octal_number SP pathname CRLF { if (check_write($7, 0)) { - if ($5 > 0777) + if (($5 == -1) || ($5 > 0777)) reply(501, "CHMOD: Mode value must be between 0 and 0777"); else if (chmod($7, $5) < 0) @@ -883,8 +875,8 @@ : REST check_login SP NUMBER CRLF { if ($2) { - fromname = NULL; - restart_point = $4.o; + REASSIGN(fromname, NULL); + restart_point = (off_t)$4.ll; reply(350, "Restarting at " LLF ". Send STORE or RETRIEVE to initiate transfer.", (LLT)restart_point); @@ -894,8 +886,10 @@ | RNFR SP pathname CRLF { restart_point = (off_t) 0; - if (check_write($3, 0)) + if (check_write($3, 0)) { + REASSIGN(fromname, NULL); fromname = renamefrom($3); + } if ($3 != NULL) free($3); } @@ -987,7 +981,7 @@ memset(&data_dest, 0, sizeof(data_dest)); #endif /* INET6 */ /* reject invalid LPRT command */ - if ($1.i != 6.i || $3.i != 16.i || $37.i != 2) + if ($1.i != 6 || $3.i != 16 || $37.i != 2) memset(&data_dest, 0, sizeof(data_dest)); } ; @@ -1302,8 +1296,7 @@ static int check_write(const char *, int); static void help(struct tab *, const char *); static void port_check(const char *, int); -static void toolong(int); -static int yylex(void); + int yylex(void); extern int epsvall; @@ -1449,19 +1442,6 @@ return (s); } -static void -toolong(int signo) -{ - - reply(421, - "Timeout (" LLF " seconds): closing control connection.", - (LLT)curclass.timeout); - if (logging) - syslog(LOG_INFO, "User %s timed out after " LLF " seconds", - (pw ? pw->pw_name : "unknown"), (LLT)curclass.timeout); - dologout(1); -} - void ftp_handle_line(char *cp) { @@ -1475,7 +1455,6 @@ { while (1) { - (void) signal(SIGALRM, toolong); (void) alarm(curclass.timeout); if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) { reply(221, "You could at least say goodbye."); @@ -1487,7 +1466,7 @@ /*NOTREACHED*/ } -static int +int yylex(void) { static int cpos, state; @@ -1626,15 +1605,14 @@ c = cmdp[cpos]; cmdp[cpos] = '\0'; yylval.u.i = atoi(cp); - yylval.u.o = strtoull(cp, (char **)NULL, 10); + yylval.u.ll = STRTOLL(cp, (char **)NULL, 10); cmdp[cpos] = c; return (NUMBER); } if (strncasecmp(&cmdp[cpos], "ALL", 3) == 0 - && !isalnum(cmdp[cpos + 3])) { - yylval.s = xstrdup("ALL"); + && !isalnum(cmdp[cpos + 3])) { cpos += 3; - return ALL; + return (ALL); } switch (cmdp[cpos++]) { @@ -1720,9 +1698,7 @@ } yyerror(NULL); state = CMD; - is_oob = 0; - longjmp(errcatch, 0); - /* NOTREACHED */ + return (0); } /* ARGSUSED */ ==== //depot/projects/hammer/contrib/lukemftpd/src/ftpd.8#3 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $NetBSD: ftpd.8,v 1.69 2002/02/08 01:30:07 ross Exp $ +.\" $NetBSD: ftpd.8,v 1.74 2003-08-07 09:46:39 agc Exp $ .\" -.\" Copyright (c) 1997-2002 The NetBSD Foundation, Inc. +.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation @@ -45,11 +45,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -67,7 +63,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd October 25, 2002 +.Dd February 26, 2003 .Dt FTPD 8 .Os .Sh NAME @@ -82,6 +78,7 @@ .Op Fl C Ar user .Op Fl e Ar emailaddr .Op Fl h Ar hostname +.Op Fl L Ar xferlogfile .Op Fl P Ar dataport .Op Fl V Ar version .Sh DESCRIPTION @@ -172,6 +169,13 @@ If this option is specified more than once, the retrieve (get), store (put), append, delete, make directory, remove directory and rename operations and their file name arguments are also logged. +.It Fl L Ar xferlogfile +Log +.Tn wu-ftpd +style +.Sq xferlog +entries to +.Ar xferlogfile . .It Fl P Ar dataport Use .Ar dataport @@ -392,7 +396,7 @@ .Dq globbing conventions used by .Xr csh 1 . -This allows users to utilize the metacharacters +This allows users to use the metacharacters .Dq Li \&*?[]{}~ . .Ss User authentication .Nm ==== //depot/projects/hammer/contrib/lukemftpd/src/ftpd.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.158 2004-08-09 12:56:47 lukem Exp $ */ /* - * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. + * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -48,11 +48,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -109,10 +105,10 @@ #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.158 2004-08-09 12:56:47 lukem Exp $"); #endif #endif /* not lint */ -__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.3 2003/02/02 21:03:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.4 2004/08/18 06:34:20 obrien Exp $"); /* * FTP server. @@ -145,7 +141,6 @@ #include #include #include -#include #include #include #include @@ -169,14 +164,19 @@ #include #include #endif +#ifdef LOGIN_CAP +#include +#endif #define GLOBAL #include "extern.h" #include "pathnames.h" #include "version.h" +volatile sig_atomic_t transflag; +volatile sig_atomic_t urgflag; + int data; -jmp_buf urgcatch; int sflag; int stru; /* avoid C keyword */ int mode; @@ -184,7 +184,8 @@ int dopidfile; /* maintain pid file */ int doutmp; /* update utmp file */ int dowtmp; /* update wtmp file */ -int doxferlog; /* syslog wu-ftpd style xferlog entries */ +int doxferlog; /* syslog/write wu-ftpd style xferlog entries */ +int xferlogfd; /* fd to write wu-ftpd xferlog entries to */ int dropprivs; /* if privileges should or have been dropped */ int mapped; /* IPv4 connection on AF_INET6 socket */ off_t file_size; @@ -200,6 +201,9 @@ static const char *anondir = NULL; static const char *confdir = _DEFAULT_CONFDIR; +static char *curname; /* current USER name */ +static size_t curname_len; /* length of curname (include NUL) */ + #if defined(KERBEROS) || defined(KERBEROS5) int has_ccache = 0; int notickets = 1; @@ -223,6 +227,7 @@ enum send_status { SS_SUCCESS, + SS_ABORTED, /* transfer aborted */ SS_NO_TRANSFER, /* no transfer made yet */ SS_FILE_ERROR, /* file read error */ SS_DATA_ERROR /* data send error */ @@ -253,7 +258,10 @@ static void login_utmp(const char *, const char *, const char *); static void logremotehost(struct sockinet *); static void lostconn(int); -static void myoob(int); +static void toolong(int); +static void sigquit(int); +static void sigurg(int); +static int handleoobcmd(void); static int receive_data(FILE *, FILE *); static int send_data(FILE *, FILE *, const struct stat *, int); static struct passwd *sgetpwnam(const char *); @@ -285,7 +293,9 @@ krb5_error_code kerror; #endif char *p; + const char *xferlogname = NULL; long l; + struct sigaction sa; connections = 1; debug = 0; @@ -297,6 +307,7 @@ doutmp = 0; /* default: Do NOT log to utmp */ dowtmp = 1; /* default: DO log to wtmp */ doxferlog = 0; /* default: Do NOT syslog xferlog */ + xferlogfd = -1; /* default: Do NOT write xferlog file */ dropprivs = 0; mapped = 0; usedefault = 1; @@ -313,7 +324,7 @@ */ openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "a:c:C:de:h:HlP:qQrst:T:uUvV:wWX")) + while ((ch = getopt(argc, argv, "a:c:C:de:h:HlL:P:qQrst:T:uUvV:wWX")) != -1) { switch (ch) { case 'a': @@ -352,6 +363,10 @@ logging++; /* > 1 == extra logging */ break; + case 'L': + xferlogname = optarg; + break; + case 'P': errno = 0; p = NULL; @@ -413,7 +428,7 @@ break; case 'X': - doxferlog = 1; + doxferlog |= 1; break; default: @@ -426,6 +441,23 @@ if (EMPTYSTR(confdir)) confdir = _DEFAULT_CONFDIR; + errno = 0; + l = sysconf(_SC_LOGIN_NAME_MAX); + if (l == -1 && errno != 0) { + syslog(LOG_ERR, "sysconf _SC_LOGIN_NAME_MAX: %m"); + exit(1); + } else if (l <= 0) { + syslog(LOG_WARNING, "using conservative LOGIN_NAME_MAX value"); + curname_len = _POSIX_LOGIN_NAME_MAX; + } else + curname_len = (size_t)l; + curname = malloc(curname_len); + if (curname == NULL) { + syslog(LOG_ERR, "malloc: %m"); + exit(1); + } + curname[0] = '\0'; + memset((char *)&his_addr, 0, sizeof(his_addr)); addrlen = sizeof(his_addr.si_su); if (getpeername(0, (struct sockaddr *)&his_addr.si_su, &addrlen) < 0) { @@ -506,10 +538,26 @@ (void)snprintf(ttyline, sizeof(ttyline), "ftp%d", getpid()); (void) freopen(_PATH_DEVNULL, "w", stderr); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 19 14:53:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DB6C16A4D0; Thu, 19 Aug 2004 14:53:58 +0000 (GMT) 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 34A7F16A4CE for ; Thu, 19 Aug 2004 14:53:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14F3543D49 for ; Thu, 19 Aug 2004 14:53:58 +0000 (GMT) (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.11/8.12.11) with ESMTP id i7JErwm6035907 for ; Thu, 19 Aug 2004 14:53:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7JErvaY035904 for perforce@freebsd.org; Thu, 19 Aug 2004 14:53:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 19 Aug 2004 14:53:57 GMT Message-Id: <200408191453.i7JErvaY035904@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 60065 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: Thu, 19 Aug 2004 14:53:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=60065 Change 60065 by rwatson@rwatson_tislabs on 2004/08/19 14:53:14 Integrate netperf_socket: More ACPI stuff. Profiling of hashing for mutexes. Various build fixen. More GEOM stuff. More aic stuff. Consistency and abstraction improvements for sleep queues. FS_BAD2_MAGIC now FS_BAD_MAGIC. Loop back of UNP_UNLOCK_ASSERT() from rwatson_netperf. Loop back of inpcb assertion fixups. Loop back of udp_send()/udp_output() locking push-down and cleanup. Affected files ... .. //depot/projects/netperf_socket/sys/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/common/help.common#5 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#7 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#37 integrate .. //depot/projects/netperf_socket/sys/conf/options#27 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#38 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_eisa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_slice.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#25 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#18 integrate .. //depot/projects/netperf_socket/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#22 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#25 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#23 integrate .. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/fs.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/Makefile#3 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/sys/Makefile,v 1.30 2004/05/16 00:19:12 cognet Exp $ +# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ # The boot loader +.if !defined(NO_BOOT) .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif +.endif # Loadable kernel modules .if defined(MODULES_WITH_WORLD) ==== //depot/projects/netperf_socket/sys/boot/common/help.common#5 (text+ko) ==== @@ -277,13 +277,6 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). - set hw.pci.allow_unsupported_io_range= - - Allow the PCI Bridge to pass through an unsupported - memory range assigned by the BIOS. - - value is 0 (default) or non-zero to enable. - set hw.pci.enable_io_modes= Enable PCI resources which are left off by some BIOSes ==== //depot/projects/netperf_socket/sys/boot/common/loader.8#7 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.64 2004/07/08 22:35:33 brian Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.66 2004/08/18 09:39:24 maxim Exp $ .\" -.Dd January 27, 2004 +.Dd August 18, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -426,10 +426,6 @@ enabled correctly by the device driver. Tunable value set to ON (1) by default, but this may cause problems with some peripherals. -.It Va hw.pci.allow_unsupported_io_range -Allow the PCI bridge to pass through an unsupported memory range -assigned by the BIOS. -Tunable value set to OFF (0) by default. .It Va kern.maxusers Set the size of a number of statically allocated system tables; see .Xr tuning 7 ==== //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.16 2004/08/16 15:45:25 marius Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.17 2004/08/18 11:31:00 grehan Exp $ PROG= loader -NOMAN= NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" BINDIR?= /boot INSTALLFLAGS= -b ==== //depot/projects/netperf_socket/sys/conf/NOTES#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1261 2004/08/16 06:36:20 pjd Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1262 2004/08/19 06:38:26 jmg Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -222,6 +222,10 @@ # MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes). See # MUTEX_PROFILING(9) for details. options MUTEX_PROFILING +# Set the number of buffers and the hash size. The hash size MUST be larger +# than the number of buffers. Hash size should be prime. +options MPROF_BUFFERS="1536" +options MPROF_HASH_SIZE="1543" # Profiling for internal hash tables. options SLEEPQUEUE_PROFILING ==== //depot/projects/netperf_socket/sys/conf/options#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.475 2004/08/17 22:05:53 andre Exp $ +# $FreeBSD: src/sys/conf/options,v 1.476 2004/08/19 06:38:26 jmg Exp $ # # On the handling of kernel options # @@ -108,6 +108,8 @@ MAC_TEST opt_dontuse.h MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h +MPROF_BUFFERS opt_mprof.h +MPROF_HASH_SIZE opt_mprof.h MUTEX_WAKE_ALL NSWBUF_MIN opt_swap.h PANIC_REBOOT_WAIT_TIME opt_panic.h ==== //depot/projects/netperf_socket/sys/conf/options.pc98#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.177 2004/08/16 13:59:01 rwatson Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.178 2004/08/18 03:46:39 rwatson Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -108,3 +108,6 @@ DEV_APIC opt_apic.h DEV_MECIA opt_mecia.h DEV_NPX opt_npx.h + +# agp options +AGP_AMD64_GART opt_agp.h ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#5 (text+ko) ==== @@ -1050,7 +1050,8 @@ UINT32 Component; \ UINT32 Line; \ char Module[ACPI_MAX_MODULE_NAME]; \ - UINT8 AllocType; + UINT8 AllocType; \ + UINT8 Padding[3]; typedef struct acpi_debug_mem_header { ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#38 (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/acpica/acpi.c,v 1.186 2004/08/13 06:21:32 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.188 2004/08/18 07:00:43 njl Exp $ */ #include "opt_acpi.h" @@ -625,7 +625,7 @@ size_t buflen) { struct acpi_device *dinfo = device_get_ivars(child); - + if (dinfo->ad_handle) snprintf(buf, buflen, "handle=%s", acpi_name(dinfo->ad_handle)); else @@ -1581,7 +1581,7 @@ { ACPI_OBJECT *comp; int i; - + if (pkg == NULL || pkg->Type != ACPI_TYPE_PACKAGE) return (AE_BAD_PARAMETER); @@ -1636,7 +1636,7 @@ { ACPI_RESOURCE *rp; void *newp; - + /* Initialise the buffer if necessary. */ if (buf->Pointer == NULL) { buf->Length = ACPI_INITIAL_RESOURCE_BUFFER_SIZE; @@ -1648,7 +1648,7 @@ } if (res == NULL) return (AE_OK); - + /* * Scan the current buffer looking for the terminator. * This will either find the terminator or hit the end @@ -1687,10 +1687,10 @@ buf->Pointer = newp; buf->Length += buf->Length; } - + /* Insert the new resource. */ bcopy(res, rp, res->Length + ACPI_RESOURCE_LENGTH_NO_DATA); - + /* And add the terminator. */ rp = ACPI_NEXT_RESOURCE(rp); rp->Id = ACPI_RSTYPE_END_TAG; @@ -1837,10 +1837,10 @@ acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; } + if (slp_state >= ACPI_SS_SLP_PREP) + AcpiLeaveSleepState(state); if (slp_state >= ACPI_SS_DEV_SUSPEND) DEVICE_RESUME(root_bus); - if (slp_state >= ACPI_SS_SLP_PREP) - AcpiLeaveSleepState(state); if (slp_state >= ACPI_SS_SLEPT) acpi_enable_fixed_events(sc); @@ -2146,49 +2146,6 @@ } /* - * Enable/Disable ACPI - */ -ACPI_STATUS -acpi_Enable(struct acpi_softc *sc) -{ - ACPI_STATUS status; - u_int32_t flags; - - ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - - status = AE_ERROR; - flags = ACPI_NO_ADDRESS_SPACE_INIT | ACPI_NO_HARDWARE_INIT | - ACPI_NO_DEVICE_INIT | ACPI_NO_OBJECT_INIT; - - ACPI_SERIAL_BEGIN(acpi); - if (!sc->acpi_enabled) - status = AcpiEnableSubsystem(flags); - if (ACPI_SUCCESS(status)) - sc->acpi_enabled = 1; - ACPI_SERIAL_END(acpi); - - return_ACPI_STATUS (status); -} - -ACPI_STATUS -acpi_Disable(struct acpi_softc *sc) -{ - ACPI_STATUS status; - - ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - - status = AE_ERROR; - ACPI_SERIAL_BEGIN(acpi); - if (sc->acpi_enabled) - status = AcpiDisable(); - if (ACPI_SUCCESS(status)) - sc->acpi_enabled = 0; - ACPI_SERIAL_END(acpi); - - return_ACPI_STATUS (status); -} - -/* * ACPI Event Handlers */ @@ -2463,14 +2420,6 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_ENABLE: - if (ACPI_FAILURE(acpi_Enable(sc))) - error = ENXIO; - break; - case ACPIIO_DISABLE: - if (ACPI_FAILURE(acpi_Disable(sc))) - error = ENXIO; - break; case ACPIIO_SETSLPSTATE: error = EINVAL; state = *(int *)addr; ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.24 2004/08/13 19:27:21 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.25 2004/08/18 16:39:59 njl Exp $"); #include "opt_acpi.h" #include @@ -648,10 +648,9 @@ * assume we were successful. */ error = acpi_pci_link_get_current_irq(link, &link->current_irq); - if (ACPI_FAILURE(error)) { + if (ACPI_FAILURE(error) && bootverbose) { printf("acpi link set: _CRS failed for link %s - %s\n", acpi_name(link->handle), AcpiFormatException(error)); - goto out; } if (link->current_irq != irq) { printf("acpi link set: curr irq %d != %d for %s (ignoring)\n", ==== //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#3 (text+ko) ==== @@ -24,14 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.10 2004/06/22 08:23:26 brueffer Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.11 2004/08/18 05:48:24 njl Exp $ */ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_ENABLE _IO('P', 1) -#define ACPIIO_DISABLE _IO('P', 2) #define ACPIIO_SETSLPSTATE _IOW('P', 3, int) struct acpi_battdesc { ==== //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#21 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.79 2004/08/13 06:21:19 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.80 2004/08/18 05:48:24 njl Exp $ */ #include "acpi_if.h" @@ -274,8 +274,6 @@ int acpi_wake_set_enable(device_t dev, int enable); int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); ACPI_STATUS acpi_Startup(void); -ACPI_STATUS acpi_Enable(struct acpi_softc *sc); -ACPI_STATUS acpi_Disable(struct acpi_softc *sc); void acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify); struct resource *acpi_bus_alloc_gas(device_t dev, int *rid, ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_isa.c#2 (text+ko) ==== @@ -36,12 +36,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.1 2004/08/17 02:32:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.3 2004/08/18 17:17:43 gibbs Exp $"); #include #include /* For CHAR_BIT*/ -#include /* For EISA constants */ #include /* For ISA attach glue */ @@ -62,7 +61,7 @@ */ static struct aic7770_identity * ahc_isa_find_device(bus_space_tag_t tag, bus_space_handle_t bsh) { - eisa_id_t id; + uint32_t id; u_int id_size; int i; @@ -93,7 +92,7 @@ int rid; rid = 0; - iobase = (slot * EISA_SLOT_SIZE) + AHC_EISA_SLOT_OFFSET; + iobase = (slot * AHC_EISA_SLOT_SIZE) + AHC_EISA_SLOT_OFFSET; regs = bus_alloc_resource(parent, SYS_RES_IOPORT, &rid, iobase, iobase, AHC_EISA_IOSIZE, RF_ACTIVE); @@ -138,7 +137,6 @@ int error; int zero; - iobase = isa_get_port(dev); error = ENODEV; zero = 0; regs = NULL; @@ -146,10 +144,11 @@ regs = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &zero, RF_ACTIVE); if (regs == NULL) { - device_printf(dev, "ioport 0x%x alloc failed\n", iobase); + device_printf(dev, "No resources alloated.\n"); return (ENOMEM); } + iobase = rman_get_start(regs); tag = rman_get_bustag(regs); bsh = rman_get_bushandle(regs); ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.31 2004/08/17 00:14:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.32 2004/08/18 16:35:52 gibbs Exp $"); #include #include #include @@ -9391,7 +9391,7 @@ * untimed-out command is outstanding. */ if (ahd_other_scb_timeout(ahd, scb, - active_scb) != 0) + active_scb) == 0) goto bus_reset; continue; } @@ -9430,7 +9430,7 @@ * some other command. Reset the timer * and go on. */ - if (ahd_other_scb_timeout(ahd, scb, NULL) != 0) + if (ahd_other_scb_timeout(ahd, scb, NULL) == 0) goto bus_reset; } else { /* ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#6 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.21 2004/08/17 00:14:30 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.22 2004/08/18 16:33:14 gibbs Exp $ */ #ifndef _AIC79XX_H_ @@ -1346,19 +1346,6 @@ extern struct ahd_pci_identity ahd_pci_ident_table []; extern const u_int ahd_num_pci_devs; -/***************************** VL/EISA Declarations ***************************/ -struct aic7770_identity { - uint32_t full_id; - uint32_t id_mask; - char *name; - ahd_device_setup_t *setup; -}; -extern struct aic7770_identity aic7770_ident_table []; -extern const int ahd_num_aic7770_devs; - -#define AHD_EISA_SLOT_OFFSET 0xc00 -#define AHD_EISA_IOSIZE 0x100 - /*************************** Function Declarations ****************************/ /******************************************************************************/ void ahd_reset_cmds_pending(struct ahd_softc *ahd); ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.51 2004/08/17 00:14:31 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.52 2004/08/18 16:31:56 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -1175,6 +1175,7 @@ extern struct aic7770_identity aic7770_ident_table[]; extern const int ahc_num_aic7770_devs; +#define AHC_EISA_SLOT_SIZE 0x1000 #define AHC_EISA_SLOT_OFFSET 0xc00 #define AHC_EISA_IOSIZE 0x100 ==== //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.34 2004/08/12 03:02:16 rwatson Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.35 2004/08/18 04:54:54 rwatson Exp $ */ #include "opt_inet.h" @@ -488,6 +488,8 @@ struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe; int s; + GIANT_REQUIRED; + FWEDEBUG(ifp, "starting\n"); if (fwe->dma_ch < 0) { ==== //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.7 2004/06/24 18:30:08 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.8 2004/08/18 16:14:44 vkashyap Exp $ */ /* @@ -657,7 +657,7 @@ for (i = 0; i < nsegments; i++) { sgl[i].address = segs[i].ds_addr; - sgl[i].length = segs[i].ds_len; + sgl[i].length = (u_int32_t)(segs[i].ds_len); } } ==== //depot/projects/netperf_socket/sys/dev/twa/twa_reg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/twa_reg.h,v 1.1 2004/03/30 03:45:59 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twa/twa_reg.h,v 1.2 2004/08/18 16:14:44 vkashyap Exp $ */ /* @@ -198,7 +198,7 @@ /* Scatter/Gather list entry. */ struct twa_sg { bus_addr_t address; - bus_size_t length; + u_int32_t length; } __attribute__ ((packed)); ==== //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.51 2004/08/14 00:12:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.52 2004/08/18 16:56:54 gibbs Exp $"); /* * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support @@ -84,35 +84,51 @@ #define ETHER_ALIGN 2 static struct connector_entry { - int bit; - char *name; + int bit; + char *name; } conn_tab[VX_CONNECTORS] = { + #define CONNECTOR_UTP 0 - { 0x08, "utp"}, + { + 0x08, "utp" + }, #define CONNECTOR_AUI 1 - { 0x20, "aui"}, + { + 0x20, "aui" + }, /* dummy */ - { 0, "???"}, + { + 0, "???" + }, #define CONNECTOR_BNC 3 - { 0x10, "bnc"}, + { + 0x10, "bnc" + }, #define CONNECTOR_TX 4 - { 0x02, "tx"}, + { + 0x02, "tx" + }, #define CONNECTOR_FX 5 - { 0x04, "fx"}, + { + 0x04, "fx" + }, #define CONNECTOR_MII 6 - { 0x40, "mii"}, - { 0, "???"} + { + 0x40, "mii" + }, + { + 0, "???" + } }; /* int vxattach(struct vx_softc *); */ static void vxtxstat(struct vx_softc *); static int vxstatus(struct vx_softc *); static void vxinit(void *); -static int vxioctl(struct ifnet *, u_long, caddr_t); -static void vxstart(struct ifnet *ifp); +static int vxioctl(struct ifnet *, u_long, caddr_t); +static void vxstart(struct ifnet *); static void vxwatchdog(struct ifnet *); static void vxreset(struct vx_softc *); -/* void vxstop(struct vx_softc *); */ static void vxread(struct vx_softc *); static struct mbuf *vxget(struct vx_softc *, u_int); static void vxmbuffill(void *); @@ -120,381 +136,372 @@ static void vxsetfilter(struct vx_softc *); static void vxgetlink(struct vx_softc *); static void vxsetlink(struct vx_softc *); -/* int vxbusyeeprom(struct vx_softc *); */ - int -vxattach(dev) - device_t dev; +vxattach(device_t dev) { - struct vx_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - int i; + struct vx_softc *sc = device_get_softc(dev); + struct ifnet *ifp = &sc->arpcom.ac_if; + int i; + + callout_handle_init(&sc->ch); + GO_WINDOW(0); + CSR_WRITE_2(sc, VX_COMMAND, GLOBAL_RESET); + VX_BUSY_WAIT; - callout_handle_init(&sc->ch); - GO_WINDOW(0); - CSR_WRITE_2(sc, VX_COMMAND, GLOBAL_RESET); - VX_BUSY_WAIT; + vxgetlink(sc); - vxgetlink(sc); + /* + * Read the station address from the eeprom + */ + GO_WINDOW(0); + for (i = 0; i < 3; i++) { + int x; - /* - * Read the station address from the eeprom - */ - GO_WINDOW(0); - for (i = 0; i < 3; i++) { - int x; - if (vxbusyeeprom(sc)) - return 0; - CSR_WRITE_2(sc, VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD - | (EEPROM_OEM_ADDR0 + i)); - if (vxbusyeeprom(sc)) - return 0; - x = CSR_READ_2(sc, VX_W0_EEPROM_DATA); - sc->arpcom.ac_enaddr[(i << 1)] = x >> 8; - sc->arpcom.ac_enaddr[(i << 1) + 1] = x; - } + if (vxbusyeeprom(sc)) + return 0; + CSR_WRITE_2(sc, VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD + | (EEPROM_OEM_ADDR0 + i)); + if (vxbusyeeprom(sc)) + return 0; + x = CSR_READ_2(sc, VX_W0_EEPROM_DATA); + sc->arpcom.ac_enaddr[(i << 1)] = x >> 8; + sc->arpcom.ac_enaddr[(i << 1) + 1] = x; + } - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | - IFF_NEEDSGIANT; - ifp->if_start = vxstart; - ifp->if_ioctl = vxioctl; - ifp->if_init = vxinit; - ifp->if_watchdog = vxwatchdog; - ifp->if_softc = sc; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_mtu = ETHERMTU; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | + IFF_NEEDSGIANT; + ifp->if_start = vxstart; + ifp->if_ioctl = vxioctl; + ifp->if_init = vxinit; + ifp->if_watchdog = vxwatchdog; + ifp->if_softc = sc; - ether_ifattach(ifp, sc->arpcom.ac_enaddr); + ether_ifattach(ifp, sc->arpcom.ac_enaddr); - sc->tx_start_thresh = 20; /* probably a good starting point. */ + sc->tx_start_thresh = 20; /* probably a good starting point. */ - vxstop(sc); + vxstop(sc); - return 1; + return 1; } - - /* * The order in here seems important. Otherwise we may not receive * interrupts. ?! */ static void -vxinit(xsc) - void *xsc; +vxinit(void *xsc) { - struct vx_softc *sc = (struct vx_softc *) xsc; - struct ifnet *ifp = &sc->arpcom.ac_if; - int i; + struct vx_softc *sc = (struct vx_softc *)xsc; + struct ifnet *ifp = &sc->arpcom.ac_if; + int i; - VX_BUSY_WAIT; + VX_BUSY_WAIT; - GO_WINDOW(2); + GO_WINDOW(2); - for (i = 0; i < 6; i++) /* Reload the ether_addr. */ - CSR_WRITE_1(sc, VX_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); + for (i = 0; i < 6; i++) /* Reload the ether_addr. */ + CSR_WRITE_1(sc, VX_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); - CSR_WRITE_2(sc, VX_COMMAND, RX_RESET); - VX_BUSY_WAIT; - CSR_WRITE_2(sc, VX_COMMAND, TX_RESET); - VX_BUSY_WAIT; + CSR_WRITE_2(sc, VX_COMMAND, RX_RESET); + VX_BUSY_WAIT; + CSR_WRITE_2(sc, VX_COMMAND, TX_RESET); + VX_BUSY_WAIT; - GO_WINDOW(1); /* Window 1 is operating window */ - for (i = 0; i < 31; i++) - CSR_READ_1(sc, VX_W1_TX_STATUS); + GO_WINDOW(1); /* Window 1 is operating window */ + for (i = 0; i < 31; i++) + CSR_READ_1(sc, VX_W1_TX_STATUS); - CSR_WRITE_2(sc, VX_COMMAND,SET_RD_0_MASK | S_CARD_FAILURE | - S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL); - CSR_WRITE_2(sc, VX_COMMAND,SET_INTR_MASK | S_CARD_FAILURE | - S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL); + CSR_WRITE_2(sc, VX_COMMAND, SET_RD_0_MASK | S_CARD_FAILURE | + S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL); + CSR_WRITE_2(sc, VX_COMMAND, SET_INTR_MASK | S_CARD_FAILURE | + S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL); - /* - * Attempt to get rid of any stray interrupts that occured during - * configuration. On the i386 this isn't possible because one may - * already be queued. However, a single stray interrupt is - * unimportant. - */ - CSR_WRITE_2(sc, VX_COMMAND, ACK_INTR | 0xff); + /* + * Attempt to get rid of any stray interrupts that occured during + * configuration. On the i386 this isn't possible because one may + * already be queued. However, a single stray interrupt is + * unimportant. + */ + CSR_WRITE_2(sc, VX_COMMAND, ACK_INTR | 0xff); - vxsetfilter(sc); - vxsetlink(sc); + vxsetfilter(sc); + vxsetlink(sc); - CSR_WRITE_2(sc, VX_COMMAND, RX_ENABLE); - CSR_WRITE_2(sc, VX_COMMAND, TX_ENABLE); + CSR_WRITE_2(sc, VX_COMMAND, RX_ENABLE); + CSR_WRITE_2(sc, VX_COMMAND, TX_ENABLE); - vxmbuffill((caddr_t) sc); + vxmbuffill((caddr_t) sc); - /* Interface is now `running', with no output active. */ - ifp->if_flags |= IFF_RUNNING; - ifp->if_flags &= ~IFF_OACTIVE; + /* Interface is now `running', with no output active. */ + ifp->if_flags |= IFF_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; - /* Attempt to start output, if any. */ - vxstart(ifp); + /* Attempt to start output, if any. */ + vxstart(ifp); } static void -vxsetfilter(sc) - struct vx_softc *sc; +vxsetfilter(struct vx_softc *sc) { - register struct ifnet *ifp = &sc->arpcom.ac_if; - - GO_WINDOW(1); /* Window 1 is operating window */ - CSR_WRITE_2(sc, VX_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | FIL_BRDCST | - FIL_MULTICAST | - ((ifp->if_flags & IFF_PROMISC) ? FIL_PROMISC : 0 )); -} + register struct ifnet *ifp = &sc->arpcom.ac_if; + + GO_WINDOW(1); /* Window 1 is operating window */ + CSR_WRITE_2(sc, VX_COMMAND, SET_RX_FILTER | + FIL_INDIVIDUAL | FIL_BRDCST | FIL_MULTICAST | + ((ifp->if_flags & IFF_PROMISC) ? FIL_PROMISC : 0)); +} -static void -vxgetlink(sc) - struct vx_softc *sc; +static void +vxgetlink(struct vx_softc *sc) { - int n, k; + int n, k; - GO_WINDOW(3); - sc->vx_connectors = CSR_READ_2(sc, VX_W3_RESET_OPT) & 0x7f; - for (n = 0, k = 0; k < VX_CONNECTORS; k++) { - if (sc->vx_connectors & conn_tab[k].bit) { - if (n > 0) { - printf("/"); + GO_WINDOW(3); + sc->vx_connectors = CSR_READ_2(sc, VX_W3_RESET_OPT) & 0x7f; + for (n = 0, k = 0; k < VX_CONNECTORS; k++) { + if (sc->vx_connectors & conn_tab[k].bit) { + if (n > 0) + printf("/"); + printf("%s", conn_tab[k].name); + n++; + } + } + if (sc->vx_connectors == 0) { + printf("no connectors!"); + return; + } + GO_WINDOW(3); + sc->vx_connector = + (CSR_READ_4(sc, VX_W3_INTERNAL_CFG) & INTERNAL_CONNECTOR_MASK) + >> INTERNAL_CONNECTOR_BITS; + if (sc->vx_connector & 0x10) { + sc->vx_connector &= 0x0f; + printf("[*%s*]", conn_tab[(int)sc->vx_connector].name); + printf(": disable 'auto select' with DOS util!"); + } else { + printf("[*%s*]", conn_tab[(int)sc->vx_connector].name); } - printf("%s", conn_tab[k].name); - n++; - } - } - if (sc->vx_connectors == 0) { - printf("no connectors!"); - return; - } - GO_WINDOW(3); - sc->vx_connector = (CSR_READ_4(sc, VX_W3_INTERNAL_CFG) - & INTERNAL_CONNECTOR_MASK) - >> INTERNAL_CONNECTOR_BITS; - if (sc->vx_connector & 0x10) { - sc->vx_connector &= 0x0f; - printf("[*%s*]", conn_tab[(int)sc->vx_connector].name); - printf(": disable 'auto select' with DOS util!"); - } else { - printf("[*%s*]", conn_tab[(int)sc->vx_connector].name); - } } -static void -vxsetlink(sc) - struct vx_softc *sc; -{ - register struct ifnet *ifp = &sc->arpcom.ac_if; - int i, j, k; - char *reason, *warning; - static int prev_flags; - static char prev_conn = -1; +static void +vxsetlink(struct vx_softc *sc) +{ + register struct ifnet *ifp = &sc->arpcom.ac_if; + int i, j, k; + char *reason, *warning; + static int prev_flags; + static char prev_conn = -1; - if (prev_conn == -1) { - prev_conn = sc->vx_connector; - } + if (prev_conn == -1) + prev_conn = sc->vx_connector; - /* - * S.B. - * - * Now behavior was slightly changed: - * - * if any of flags link[0-2] is used and its connector is - * physically present the following connectors are used: - * - * link0 - AUI * highest precedence - * link1 - BNC - * link2 - UTP * lowest precedence - * - * If none of them is specified then - * connector specified in the EEPROM is used - * (if present on card or UTP if not). >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 19 20:30:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DDB116A4D0; Thu, 19 Aug 2004 20:30:56 +0000 (GMT) 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 077B816A4CE for ; Thu, 19 Aug 2004 20:30:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBCA843D3F for ; Thu, 19 Aug 2004 20:30:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7JKUtBw048216 for ; Thu, 19 Aug 2004 20:30:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7JKTSNo048090 for perforce@freebsd.org; Thu, 19 Aug 2004 20:29:28 GMT (envelope-from marcel@freebsd.org) Date: Thu, 19 Aug 2004 20:29:28 GMT Message-Id: <200408192029.i7JKTSNo048090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60091 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: Thu, 19 Aug 2004 20:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=60091 Change 60091 by marcel@marcel_nfs on 2004/08/19 20:28:01 IFC @60080 Affected files ... .. //depot/projects/ia64/MAINTAINERS#41 integrate .. //depot/projects/ia64/Makefile#39 integrate .. //depot/projects/ia64/Makefile.inc1#92 integrate .. //depot/projects/ia64/UPDATING#65 integrate .. //depot/projects/ia64/bin/Makefile.inc#9 integrate .. //depot/projects/ia64/bin/cat/cat.c#10 integrate .. //depot/projects/ia64/bin/chio/chio.1#4 integrate .. //depot/projects/ia64/bin/cp/cp.1#8 integrate .. //depot/projects/ia64/bin/csh/config.h#2 integrate .. //depot/projects/ia64/bin/date/date.1#8 integrate .. //depot/projects/ia64/bin/date/vary.c#4 integrate .. //depot/projects/ia64/bin/dd/args.c#9 integrate .. //depot/projects/ia64/bin/dd/dd.1#8 integrate .. //depot/projects/ia64/bin/dd/dd.c#9 integrate .. //depot/projects/ia64/bin/dd/dd.h#6 integrate .. //depot/projects/ia64/bin/dd/extern.h#5 integrate .. //depot/projects/ia64/bin/df/df.1#9 integrate .. //depot/projects/ia64/bin/df/df.c#22 integrate .. //depot/projects/ia64/bin/domainname/domainname.1#4 integrate .. //depot/projects/ia64/bin/echo/echo.1#5 integrate .. //depot/projects/ia64/bin/ed/Makefile#10 integrate .. //depot/projects/ia64/bin/ed/ed.1#6 integrate .. //depot/projects/ia64/bin/expr/expr.1#9 integrate .. //depot/projects/ia64/bin/hostname/hostname.1#4 integrate .. //depot/projects/ia64/bin/kill/kill.1#5 integrate .. //depot/projects/ia64/bin/ln/ln.1#7 integrate .. //depot/projects/ia64/bin/ln/symlink.7#7 integrate .. //depot/projects/ia64/bin/ls/cmp.c#6 integrate .. //depot/projects/ia64/bin/ls/ls.1#22 integrate .. //depot/projects/ia64/bin/ls/ls.c#21 integrate .. //depot/projects/ia64/bin/ls/print.c#18 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.1#5 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#8 integrate .. //depot/projects/ia64/bin/pax/pax.1#8 integrate .. //depot/projects/ia64/bin/ps/extern.h#12 integrate .. //depot/projects/ia64/bin/ps/fmt.c#10 integrate .. //depot/projects/ia64/bin/ps/keyword.c#16 integrate .. //depot/projects/ia64/bin/ps/print.c#15 integrate .. //depot/projects/ia64/bin/ps/ps.1#23 integrate .. //depot/projects/ia64/bin/ps/ps.c#17 integrate .. //depot/projects/ia64/bin/ps/ps.h#8 integrate .. //depot/projects/ia64/bin/pwd/pwd.1#9 integrate .. //depot/projects/ia64/bin/rcp/rcp.1#5 integrate .. //depot/projects/ia64/bin/rm/rm.1#7 integrate .. //depot/projects/ia64/bin/setfacl/Makefile#3 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/ia64/bin/sh/bltin/echo.1#5 integrate .. //depot/projects/ia64/bin/sh/sh.1#25 integrate .. //depot/projects/ia64/bin/stty/stty.1#4 integrate .. //depot/projects/ia64/bin/test/TEST.README#2 integrate .. //depot/projects/ia64/bin/test/test.1#4 integrate .. //depot/projects/ia64/contrib/amd/AUTHORS#3 integrate .. //depot/projects/ia64/contrib/amd/BUGS#3 integrate .. //depot/projects/ia64/contrib/amd/COPYING#3 integrate .. //depot/projects/ia64/contrib/amd/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/amd/INSTALL#3 integrate .. //depot/projects/ia64/contrib/amd/MIRRORS#3 delete .. //depot/projects/ia64/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/ia64/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/ia64/contrib/amd/NEWS#3 integrate .. //depot/projects/ia64/contrib/amd/README#3 integrate .. //depot/projects/ia64/contrib/amd/README.y2k#2 integrate .. //depot/projects/ia64/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/ia64/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/ia64/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/map.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/ia64/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.c#5 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/ia64/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/ia64/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/ia64/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/ia64/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/ia64/contrib/amd/bootstrap#2 integrate .. //depot/projects/ia64/contrib/amd/commit#2 delete .. //depot/projects/ia64/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/ia64/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/ia64/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/ia64/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/ia64/contrib/amd/conf/transp/transp_sockets.c#4 integrate .. //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/ia64/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/ia64/contrib/amd/config.guess#2 delete .. //depot/projects/ia64/contrib/amd/config.guess.long#2 delete .. //depot/projects/ia64/contrib/amd/config.sub#2 delete .. //depot/projects/ia64/contrib/amd/configure.in#2 delete .. //depot/projects/ia64/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/ia64/contrib/amd/depcomp#2 delete .. //depot/projects/ia64/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/ia64/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/ia64/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/ia64/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.8#5 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/ia64/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#5 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/ia64/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/ia64/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/ia64/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/ia64/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/ia64/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/ia64/contrib/amd/install-sh#2 delete .. //depot/projects/ia64/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/ia64/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/ia64/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/ia64/contrib/amd/ltmain.sh#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/ia64/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/ia64/contrib/amd/missing#2 delete .. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/ia64/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/ia64/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/ia64/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/ia64/contrib/amd/scripts/lostaltmail.in#3 delete .. //depot/projects/ia64/contrib/amd/tasks#3 integrate .. //depot/projects/ia64/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/ia64/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/ia64/contrib/binutils/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/MAINTAINERS#4 integrate .. //depot/projects/ia64/contrib/binutils/Makefile.def#1 branch .. //depot/projects/ia64/contrib/binutils/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/binutils/Makefile.tpl#1 branch .. //depot/projects/ia64/contrib/binutils/README-maintainer-mode#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#9 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog-0001#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog-0203#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/Makefile.am#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/acinclude.m4#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aout-arm.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aout-encap.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aout-target.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aoutf1.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/aoutx.h#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/archive.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/archive64.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/archures.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bfd-in.h#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bfd-in2.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bfd.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bfdio.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/bfdwin.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/binary.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bout.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/cache.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-alpha.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-arm.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-aux.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-i386.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-ia64.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-ppc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-rs6000.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-sparc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff64-rs6000.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coffcode.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coffgen.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cofflink.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coffswap.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/config.bfd#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/config.in#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/configure#8 integrate .. //depot/projects/ia64/contrib/binutils/bfd/configure.host#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/configure.in#8 integrate .. //depot/projects/ia64/contrib/binutils/bfd/corefile.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-alpha.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-arc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-arm.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-i386.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-ia64-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-ia64.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-powerpc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-rs6000.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-s390.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-sparc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/dep-in.sed#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/ChangeLog-9103#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/aoutx.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/archive.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/archures.texi#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/bfd.texinfo#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/bfdint.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/bfdio.texi#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/bfdt.texi#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/bfdwin.texi#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/cache.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/chew.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/coffcode.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/core.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/fdl.texi#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/format.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/hash.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/init.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/libbfd.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/linker.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/mmo.texi#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/opncls.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/reloc.texi#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/section.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/syms.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/targets.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/dwarf1.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/dwarf2.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ecoff.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ecofflink.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ecoffswap.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/efi-app-ia32.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/efi-app-ia64.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf-bfd.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf-eh-frame.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf-strtab.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf.c#8 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-arc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-arm.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-gen.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-i386.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-ppc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-ppc.h#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/elf32-s390.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-sparc.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-alpha.c#9 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-gen.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-s390.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-sparc.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-x86-64.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfarm-nabi.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfarm-oabi.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfcode.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfcore.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elflink.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfxx-ia64.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfxx-target.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/format.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/freebsd.h#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/gen-aout.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/genlink.h#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/hash.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/i386aout.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/i386linux.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ieee.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ihex.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/init.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libaout.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libbfd-in.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libbfd.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libbfd.h#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libcoff-in.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libcoff.h#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libecoff.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libieee.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libpei.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libxcoff.h#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/linker.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/merge.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/netbsd-core.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/netbsd.h#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/opncls.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/osf-core.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/pe-arm.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/pe-i386.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/peXXigen.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/peicode.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/po/BLD-POTFILES.in#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/po/Make-in#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/po/SRC-POTFILES.in#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/po/bfd.pot#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ppcboot.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ptrace-core.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/reloc.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/reloc16.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/rs6000-core.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/sco5-core.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/section.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/simple.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/sparclinux.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/sparcnetbsd.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/srec.c#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/stabs.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/sunos.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/syms.c#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/sysdep.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/targets.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/tekhex.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/trad-core.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/version.h#7 integrate .. //depot/projects/ia64/contrib/binutils/bfd/xcoff-target.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/xcofflink.c#6 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog-0001#1 branch .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog-0203#1 branch .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog-9197#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog-9899#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/MAINTAINERS#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/NEWS#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/README#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/acinclude.m4#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/addr2line.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ar.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/arlex.l#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/arparse.y#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/arsup.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/arsup.h#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/binemul.c#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/binemul.h#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/bucomm.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/bucomm.h#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/budbg.h#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/budemang.c#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/budemang.h#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/coffdump.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/coffgrok.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/coffgrok.h#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/config.in#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/configure#7 integrate .. //depot/projects/ia64/contrib/binutils/binutils/configure.in#8 integrate .. //depot/projects/ia64/contrib/binutils/binutils/cxxfilt.c#1 branch .. //depot/projects/ia64/contrib/binutils/binutils/debug.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/debug.h#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/deflex.l#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dep-in.sed#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dlltool.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dlltool.h#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dllwrap.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/addr2line.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/ar.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/binutils.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/cxxfilt.man#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/dlltool.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/fdl.texi#1 branch .. //depot/projects/ia64/contrib/binutils/binutils/doc/nm.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/objcopy.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/objdump.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/ranlib.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/readelf.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/size.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/strings.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/strip.1#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/filemode.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ieee.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/nm.c#6 integrate .. //depot/projects/ia64/contrib/binutils/binutils/objcopy.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/objdump.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/po/Make-in#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/po/POTFILES.in#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/po/binutils.pot#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/prdbg.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rclex.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rclex.l#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rdcoff.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rddbg.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/readelf.c#6 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rename.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/resbin.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rescoff.c#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/resrc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/size.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/srconv.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/stabs.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/strings.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/sysdump.c#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/unwind-ia64.c#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/unwind-ia64.h#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/version.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/wrstabs.c#4 integrate .. //depot/projects/ia64/contrib/binutils/config-ml.in#3 integrate .. //depot/projects/ia64/contrib/binutils/config.guess#5 integrate .. //depot/projects/ia64/contrib/binutils/config.if#3 integrate .. //depot/projects/ia64/contrib/binutils/config.sub#5 integrate .. //depot/projects/ia64/contrib/binutils/configure#4 integrate .. //depot/projects/ia64/contrib/binutils/configure.in#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/CONTRIBUTORS#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/binutils/gas/ChangeLog-0203#1 branch .. //depot/projects/ia64/contrib/binutils/gas/ChangeLog-9295#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/NEWS#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/README#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/acinclude.m4#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/aclocal.m4#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/app.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/as.c#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/as.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/atof-generic.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/bignum-copy.c#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/bignum.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/bit_fix.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/cgen.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/cgen.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/cond.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config.in#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-aout.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-aout.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-coff.c#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-coff.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-ecoff.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-ecoff.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-elf.c#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-elf.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-ieee.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-ieee.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-multi.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-alpha.c#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-alpha.h#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-arc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-arc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-arm.c#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-arm.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-i386.c#7 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-i386.h#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-ia64.c#9 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-ia64.h#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-ppc.c#7 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-ppc.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-s390.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-s390.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-sparc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-sparc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/te-generic.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/te-pe.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/te-ppcnw.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/configure#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/configure.in#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/dep-in.sed#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/depend.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/all.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/as.1#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/as.texinfo#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-alpha.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-arm.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-i386.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-ia64.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-ppc.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-sh.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/c-sparc.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/gasver.texi#1 branch .. //depot/projects/ia64/contrib/binutils/gas/doc/h8.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/doc/internals.texi#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/dw2gencfi.c#1 branch .. //depot/projects/ia64/contrib/binutils/gas/dw2gencfi.h#1 branch .. //depot/projects/ia64/contrib/binutils/gas/dwarf2dbg.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/dwarf2dbg.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/ecoff.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/ecoff.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/ehopt.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/emul.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/expr.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/expr.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/flonum-copy.c#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/flonum-mult.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/flonum.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/frags.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/frags.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/hash.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/hash.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/input-file.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/input-file.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/input-scrub.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/itbl-ops.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/itbl-ops.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/listing.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/listing.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/macro.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/macro.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/messages.c#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/obj.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/output-file.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/output-file.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/po/Make-in#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/po/POTFILES.in#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/po/gas.pot#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/read.c#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/read.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/sb.c#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/sb.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/stabs.c#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/subsegs.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/subsegs.h#2 integrate .. //depot/projects/ia64/contrib/binutils/gas/symbols.c#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/symbols.h#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/tc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/write.c#6 integrate .. //depot/projects/ia64/contrib/binutils/gas/write.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/include/ansidecl.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/aout/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/binutils/include/aout/aout64.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/aout/stab.def#2 integrate .. //depot/projects/ia64/contrib/binutils/include/bfdlink.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/arm.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/ecoff.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/internal.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/pe.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/sh.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/ti.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/coff/xcoff.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/demangle.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/dis-asm.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ChangeLog-9103#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/arm.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/common.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/dwarf2.h#5 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/external.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/frv.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/h8.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/i370.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ia64.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/internal.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ip2k.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/iq2000.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/m32r.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/m68hc11.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/mips.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/mmix.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/mn10300.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/msp430.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/ppc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ppc64.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/reloc-macros.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/s390.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/sh.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/sparc.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/v850.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/x86-64.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/xstormy16.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/xtensa.h#1 branch .. //depot/projects/ia64/contrib/binutils/include/fibheap.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/floatformat.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/hashtab.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/libiberty.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/obstack.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/ChangeLog-9103#1 branch .. //depot/projects/ia64/contrib/binutils/include/opcode/alpha.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/arc.h#4 branch .. //depot/projects/ia64/contrib/binutils/include/opcode/cgen.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/convex.h#4 branch .. //depot/projects/ia64/contrib/binutils/include/opcode/i386.h#5 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/ia64.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/np1.h#3 branch .. //depot/projects/ia64/contrib/binutils/include/opcode/pn.h#3 branch .. //depot/projects/ia64/contrib/binutils/include/opcode/ppc.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/s390.h#2 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/sparc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/partition.h#4 integrate .. //depot/projects/ia64/contrib/binutils/include/safe-ctype.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/splay-tree.h#4 integrate .. //depot/projects/ia64/contrib/binutils/install-sh#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog#9 integrate .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog-0001#1 branch .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog-0203#1 branch .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog-9197#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/Makefile.am#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/NEWS#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/README#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/config.in#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/configure#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/configure.host#7 integrate .. //depot/projects/ia64/contrib/binutils/ld/configure.in#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/configure.tgt#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/deffile.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/deffilep.y#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/dep-in.sed#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/arcelf.sh#3 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/armelf.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/armelf_linux.sh#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/armelf_oabi.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/armpe.sh#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32_sparc.sh#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32b4300.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmipn32.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bsmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32ebmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32elmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32l4300.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lsmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32ppc.sh#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64_ia64.sh#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64_s390.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64_sparc.sh#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64alpha.sh#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64bmip.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64ppc.sh#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf_i386.sh#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf_s390.sh#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf_x86_64.sh#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/sh.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/shl.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/shlelf.sh#4 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/vanilla.sh#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/vsta.sh#3 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/alphaelf.em#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/armcoff.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/armelf.em#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/armelf_oabi.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/elf32.em#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/generic.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/ia64elf.em#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/linux.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/needrelax.em#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/netbsd.em#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/pe.em#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/ppc32elf.em#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/ppc64elf.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/sunos.em#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/ticoff.em#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/vanilla.em#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/fdl.texi#1 branch .. //depot/projects/ia64/contrib/binutils/ld/gen-doc.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/genscripts.sh#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/h8-doc.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ld.1#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/ld.h#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ld.texinfo#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldcref.c#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldctor.c#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldctor.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldemul.c#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldemul.h#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldexp.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldexp.h#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldfile.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldfile.h#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldgram.y#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldint.texinfo#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldlang.c#8 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldlang.h#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldlex.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldlex.l#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldmain.c#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldmain.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldmisc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldmisc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldver.c#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldver.h#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldver.texi#1 branch .. //depot/projects/ia64/contrib/binutils/ld/ldwrite.c#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldwrite.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/lexsup.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/mri.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/mri.h#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/pe-dll.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/pe-dll.h#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/scripttempl/armcoff.sc#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/scripttempl/elf.sc#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/scripttempl/pe.sc#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/sysdep.h#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/README#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/argv.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/asprintf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/calloc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/config.in#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/config.table#5 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/configure#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/copysign.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/cp-demangle.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/cp-demangle.h#1 branch .. //depot/projects/ia64/contrib/binutils/libiberty/cp-demint.c#1 branch .. //depot/projects/ia64/contrib/binutils/libiberty/cplus-dem.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/fibheap.c#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/floatformat.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/functions.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/getcwd.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/getpwd.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/hashtab.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/hex.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/lbasename.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/libiberty.texi#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/lrealpath.c#1 branch .. //depot/projects/ia64/contrib/binutils/libiberty/maint-tool#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/make-relative-prefix.c#1 branch .. //depot/projects/ia64/contrib/binutils/libiberty/md5.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/memchr.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/memcmp.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/memcpy.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/memmove.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/memset.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/physmem.c#1 branch .. //depot/projects/ia64/contrib/binutils/libiberty/regex.c#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/rename.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/safe-ctype.c#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/sigsetmask.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/splay-tree.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strcasecmp.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strdup.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strerror.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strncasecmp.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strncmp.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strsignal.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/strstr.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/vasprintf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/vfprintf.c#2 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/vprintf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/vsprintf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/xatexit.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/xmalloc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/libtool.m4#3 integrate .. //depot/projects/ia64/contrib/binutils/ltcf-c.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ltcf-cxx.sh#4 integrate .. //depot/projects/ia64/contrib/binutils/ltcf-gcj.sh#3 integrate .. //depot/projects/ia64/contrib/binutils/ltconfig#3 integrate .. //depot/projects/ia64/contrib/binutils/missing#2 integrate .. //depot/projects/ia64/contrib/binutils/mkinstalldirs#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog-0001#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog-0203#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/aclocal.m4#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/alpha-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/arc-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/arm-dis.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/arm-opc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-asm.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-asm.in#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-dis.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-dis.in#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-ibld.in#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/cgen.sh#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/config.in#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/configure#6 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/configure.in#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/dep-in.sed#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/dis-buf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/dis-init.c#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/disassemble.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/i386-dis.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-asmtab.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-dis.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-gen.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-ic.tbl#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-a.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-b.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-d.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-f.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-i.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-m.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc-x.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-opc.h#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-raw.tbl#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ia64-waw.tbl#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/po/Make-in#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/po/POTFILES.in#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/po/opcodes.pot#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ppc-dis.c#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ppc-opc.c#7 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/s390-dis.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/s390-mkopc.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/s390-opc.c#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/s390-opc.txt#2 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/sh-dis.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/sh-opc.h#3 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/sparc-dis.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/sparc-opc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/symlink-tree#3 integrate .. //depot/projects/ia64/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/ia64/contrib/bsnmp/VERSION#4 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.3#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpagent.3#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmplib.3#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmp.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmp.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.h#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmppriv.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/support.c#1 branch .. //depot/projects/ia64/contrib/bsnmp/lib/support.h#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ip.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_tcp.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_udp.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 20 00:13:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BFEF16A4D0; Fri, 20 Aug 2004 00:13:26 +0000 (GMT) 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 E216E16A4CE for ; Fri, 20 Aug 2004 00:13:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C796A43D2F for ; Fri, 20 Aug 2004 00:13:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7K0DPH8093620 for ; Fri, 20 Aug 2004 00:13:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7K0DPMs093617 for perforce@freebsd.org; Fri, 20 Aug 2004 00:13:25 GMT (envelope-from marcel@freebsd.org) Date: Fri, 20 Aug 2004 00:13:25 GMT Message-Id: <200408200013.i7K0DPMs093617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60098 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: Fri, 20 Aug 2004 00:13:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=60098 Change 60098 by marcel@marcel_nfs on 2004/08/20 00:12:43 Diff reduction. The IFC already partially removed the GCC mods on this branch. Affected files ... .. //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#3 edit .. //depot/projects/ia64/contrib/gcc/c-common.c#11 edit .. //depot/projects/ia64/contrib/gcc/c-common.h#9 edit .. //depot/projects/ia64/contrib/gcc/c-typeck.c#12 edit Differences ... ==== //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#3 (text+ko) ==== @@ -1,2 +1,3 @@ +/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */ /* $srcdir/conf/trap/trap_default.h */ #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) ==== //depot/projects/ia64/contrib/gcc/c-common.c#11 (text+ko) ==== @@ -372,11 +372,6 @@ /* C/ObjC language option variables. */ -/* Nonzero means message about casts with integer/pointer size mismatches; - 1 means warning; 2 means error. */ - -int mesg_bad_pointer_cast = 1; - /* Nonzero means message about use of implicit function declarations; 1 means warning; 2 means error. */ ==== //depot/projects/ia64/contrib/gcc/c-common.h#9 (text+ko) ==== @@ -535,10 +535,6 @@ /* C/ObjC language option variables. */ -/* Warn about bad pointer casts. 1 = warning, 2 = error. */ - -extern int mesg_bad_pointer_cast; - /* Nonzero means message about use of implicit function declarations; 1 means warning; 2 means error. */ ==== //depot/projects/ia64/contrib/gcc/c-typeck.c#12 (text+ko) ==== @@ -3128,16 +3128,7 @@ && TREE_CODE (otype) == POINTER_TYPE && TYPE_PRECISION (type) != TYPE_PRECISION (otype) && !TREE_CONSTANT (value)) -#if 1 /* mostly harmless */ warning ("cast from pointer to integer of different size"); -#else - { - if (mesg_bad_pointer_cast == 2) - error ("cast from pointer to integer of different size"); - else if (mesg_bad_pointer_cast == 1) - warning ("cast from pointer to integer of different size"); - } -#endif if (warn_bad_function_cast && TREE_CODE (value) == CALL_EXPR @@ -3149,12 +3140,7 @@ && TYPE_PRECISION (type) != TYPE_PRECISION (otype) /* Don't warn about converting any constant. */ && !TREE_CONSTANT (value)) - { - if (mesg_bad_pointer_cast == 2) - error ("cast to pointer from integer of different size"); - else if (mesg_bad_pointer_cast == 1) - warning ("cast to pointer from integer of different size"); - } + warning ("cast to pointer from integer of different size"); if (TREE_CODE (type) == POINTER_TYPE && TREE_CODE (otype) == POINTER_TYPE @@ -3676,11 +3662,8 @@ && TREE_CODE (TREE_TYPE (rhs)) == INTEGER_TYPE && TREE_CODE (TREE_OPERAND (rhs, 0)) == INTEGER_CST && integer_zerop (TREE_OPERAND (rhs, 0)))) - if (mesg_bad_pointer_cast == 2) - error ("%s makes pointer from integer without a cast", errtype); - else - warn_for_assignment ("%s makes pointer from integer without a cast", - errtype, funname, parmnum); + warn_for_assignment ("%s makes pointer from integer without a cast", + errtype, funname, parmnum); return convert (type, rhs); } From owner-p4-projects@FreeBSD.ORG Fri Aug 20 07:29:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A49D816A4D0; Fri, 20 Aug 2004 07:29:56 +0000 (GMT) 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 7315416A4CE for ; Fri, 20 Aug 2004 07:29:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5322943D1D for ; Fri, 20 Aug 2004 07:29:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7K7Tu3W010479 for ; Fri, 20 Aug 2004 07:29:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7K7THkn010474 for perforce@freebsd.org; Fri, 20 Aug 2004 07:29:17 GMT (envelope-from marcel@freebsd.org) Date: Fri, 20 Aug 2004 07:29:17 GMT Message-Id: <200408200729.i7K7THkn010474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60117 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: Fri, 20 Aug 2004 07:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=60117 Change 60117 by marcel@marcel_nfs on 2004/08/20 07:28:30 IFC @60114 Affected files ... .. //depot/projects/gdb/MAINTAINERS#14 integrate .. //depot/projects/gdb/Makefile#10 integrate .. //depot/projects/gdb/Makefile.inc1#13 integrate .. //depot/projects/gdb/UPDATING#24 integrate .. //depot/projects/gdb/bin/Makefile.inc#2 integrate .. //depot/projects/gdb/bin/date/date.1#7 integrate .. //depot/projects/gdb/bin/date/vary.c#2 integrate .. //depot/projects/gdb/bin/dd/args.c#4 integrate .. //depot/projects/gdb/bin/dd/dd.1#5 integrate .. //depot/projects/gdb/bin/dd/dd.c#4 integrate .. //depot/projects/gdb/bin/dd/dd.h#4 integrate .. //depot/projects/gdb/bin/dd/extern.h#3 integrate .. //depot/projects/gdb/bin/ed/Makefile#2 integrate .. //depot/projects/gdb/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/gdb/contrib/bsnmp/VERSION#4 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/gdb/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmpagent.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/bsnmplib.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmp.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmp.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpagent.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpagent.h#4 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmpclient.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/snmppriv.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/lib/support.c#1 branch .. //depot/projects/gdb/contrib/bsnmp/lib/support.h#1 branch .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ip.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_tcp.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/mibII_udp.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmp_mibII/snmp_mibII.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/FOKUS-MIB.txt#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/action.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/bsnmpd.1#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/export.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpd.sh#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpmod.3#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/snmpmod.h#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_lsock.c#3 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_lsock.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trans_udp.h#2 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/trap.c#4 integrate .. //depot/projects/gdb/contrib/bsnmp/snmpd/tree.def#3 integrate .. //depot/projects/gdb/contrib/cvs/src/tag.c#3 integrate .. //depot/projects/gdb/contrib/file/.cvsignore#2 integrate .. //depot/projects/gdb/contrib/file/ChangeLog#1 branch .. //depot/projects/gdb/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/gdb/contrib/file/Localstuff#2 integrate .. //depot/projects/gdb/contrib/file/MAINT#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/animation#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/apple#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/archive#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/audio#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/bFLT#1 branch .. //depot/projects/gdb/contrib/file/Magdir/bout#1 branch .. //depot/projects/gdb/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/c64#1 branch .. //depot/projects/gdb/contrib/file/Magdir/cad#1 branch .. //depot/projects/gdb/contrib/file/Magdir/chord#1 branch .. //depot/projects/gdb/contrib/file/Magdir/claris#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/commands#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/communications#1 branch .. //depot/projects/gdb/contrib/file/Magdir/compress#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/console#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/dact#1 branch .. //depot/projects/gdb/contrib/file/Magdir/database#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/diff#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/elf#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/fcs#1 branch .. //depot/projects/gdb/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/flash#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/games#1 branch .. //depot/projects/gdb/contrib/file/Magdir/gcc#1 branch .. //depot/projects/gdb/contrib/file/Magdir/geos#1 branch .. //depot/projects/gdb/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/human68k#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/ibm6000#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/iff#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/images#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/intel#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/linux#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/mach#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/maple#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/matroska#1 branch .. //depot/projects/gdb/contrib/file/Magdir/misctools#1 branch .. //depot/projects/gdb/contrib/file/Magdir/motorola#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/netbsd#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/netscape#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/ocaml#1 branch .. //depot/projects/gdb/contrib/file/Magdir/os2#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/palm#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/perl#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/plan9#1 branch .. //depot/projects/gdb/contrib/file/Magdir/printer#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/psion#1 branch .. //depot/projects/gdb/contrib/file/Magdir/python#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/revision#1 branch .. //depot/projects/gdb/contrib/file/Magdir/riff#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/sinclair#1 branch .. //depot/projects/gdb/contrib/file/Magdir/sniffer#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/spec#1 branch .. //depot/projects/gdb/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/sun#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/ti-8x#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/unknown#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/varied.script#1 branch .. //depot/projects/gdb/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/gdb/contrib/file/Magdir/wordprocessors#1 branch .. //depot/projects/gdb/contrib/file/Magdir/xwindows#1 branch .. //depot/projects/gdb/contrib/file/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/file/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/file/README#2 integrate .. //depot/projects/gdb/contrib/file/acinclude.m4#2 integrate .. //depot/projects/gdb/contrib/file/aclocal.m4#2 integrate .. //depot/projects/gdb/contrib/file/apprentice.c#2 integrate .. //depot/projects/gdb/contrib/file/apptype.c#1 branch .. //depot/projects/gdb/contrib/file/ascmagic.c#2 integrate .. //depot/projects/gdb/contrib/file/compress.c#2 integrate .. //depot/projects/gdb/contrib/file/config.h.in#2 integrate .. //depot/projects/gdb/contrib/file/configure#2 integrate .. //depot/projects/gdb/contrib/file/configure.in#2 integrate .. //depot/projects/gdb/contrib/file/file.c#2 integrate .. //depot/projects/gdb/contrib/file/file.h#2 integrate .. //depot/projects/gdb/contrib/file/file.man#2 integrate .. //depot/projects/gdb/contrib/file/fsmagic.c#2 integrate .. //depot/projects/gdb/contrib/file/funcs.c#1 branch .. //depot/projects/gdb/contrib/file/is_tar.c#2 integrate .. //depot/projects/gdb/contrib/file/libmagic.man#1 branch .. //depot/projects/gdb/contrib/file/magic.c#1 branch .. //depot/projects/gdb/contrib/file/magic.h#1 branch .. //depot/projects/gdb/contrib/file/magic.man#2 integrate .. //depot/projects/gdb/contrib/file/magic.mime#2 integrate .. //depot/projects/gdb/contrib/file/magic2mime#2 integrate .. //depot/projects/gdb/contrib/file/names.h#2 integrate .. //depot/projects/gdb/contrib/file/patchlevel.h#2 integrate .. //depot/projects/gdb/contrib/file/print.c#2 integrate .. //depot/projects/gdb/contrib/file/readelf.c#2 integrate .. //depot/projects/gdb/contrib/file/readelf.h#2 integrate .. //depot/projects/gdb/contrib/file/softmagic.c#2 integrate .. //depot/projects/gdb/contrib/file/tar.h#2 integrate .. //depot/projects/gdb/contrib/file/test.c#1 branch .. //depot/projects/gdb/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.1#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.10#1 branch .. //depot/projects/gdb/contrib/gcc/ChangeLog.2#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.3#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.4#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.5#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.6#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.7#2 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog.8#1 branch .. //depot/projects/gdb/contrib/gcc/ChangeLog.9#1 branch .. //depot/projects/gdb/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/gcc/README.Portability#2 integrate .. //depot/projects/gdb/contrib/gcc/acconfig.h#2 delete .. //depot/projects/gdb/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/gdb/contrib/gcc/alias.c#2 integrate .. //depot/projects/gdb/contrib/gcc/alloc-pool.c#1 branch .. //depot/projects/gdb/contrib/gcc/alloc-pool.h#1 branch .. //depot/projects/gdb/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/gdb/contrib/gcc/attribs.c#2 integrate .. //depot/projects/gdb/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/gdb/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/gdb/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/gdb/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/gdb/contrib/gcc/bt-load.c#1 branch .. //depot/projects/gdb/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/gdb/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/gdb/contrib/gcc/builtins.c#2 integrate .. //depot/projects/gdb/contrib/gcc/builtins.def#2 integrate .. //depot/projects/gdb/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-common.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-common.def#2 integrate .. //depot/projects/gdb/contrib/gcc/c-common.h#2 integrate .. //depot/projects/gdb/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-cppbuiltin.c#1 branch .. //depot/projects/gdb/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-format.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-incpath.c#1 branch .. //depot/projects/gdb/contrib/gcc/c-incpath.h#1 branch .. //depot/projects/gdb/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-parse.in#2 integrate .. //depot/projects/gdb/contrib/gcc/c-pch.c#1 branch .. //depot/projects/gdb/contrib/gcc/c-ppoutput.c#1 branch .. //depot/projects/gdb/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/gdb/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/gdb/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/gdb/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c.opt#1 branch .. //depot/projects/gdb/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/gdb/contrib/gcc/calls.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfg.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfghooks.c#1 branch .. //depot/projects/gdb/contrib/gcc/cfghooks.h#1 branch .. //depot/projects/gdb/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cfgloop.h#1 branch .. //depot/projects/gdb/contrib/gcc/cfgloopanal.c#1 branch .. //depot/projects/gdb/contrib/gcc/cfgloopmanip.c#1 branch .. //depot/projects/gdb/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cgraph.c#1 branch .. //depot/projects/gdb/contrib/gcc/cgraph.h#1 branch .. //depot/projects/gdb/contrib/gcc/cgraphunit.c#1 branch .. //depot/projects/gdb/contrib/gcc/collect2.c#2 integrate .. //depot/projects/gdb/contrib/gcc/collect2.h#2 integrate .. //depot/projects/gdb/contrib/gcc/combine.c#2 integrate .. //depot/projects/gdb/contrib/gcc/common.opt#1 branch .. //depot/projects/gdb/contrib/gcc/config.build#1 branch .. //depot/projects/gdb/contrib/gcc/config.gcc#2 integrate .. //depot/projects/gdb/contrib/gcc/config.guess#2 delete .. //depot/projects/gdb/contrib/gcc/config.host#1 branch .. //depot/projects/gdb/contrib/gcc/config.in#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha-interix.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha-modes.def#1 branch .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha32.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/alpha/elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/ev4.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/ev5.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/ev6.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/gnu.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/lib1funcs.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/linux-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/netbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/openbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/osf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/osf5.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/t-interix#2 delete .. //depot/projects/gdb/contrib/gcc/config/alpha/t-osf-pthread#1 branch .. //depot/projects/gdb/contrib/gcc/config/alpha/t-osf4#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-cc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-crt0-64.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-crt0.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-dwarf2.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-ld.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms-psxcrt0.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vms_tramp.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/vxworks.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/alpha/xm-alpha-interix.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/alpha/xm-vms.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/xm-vms64.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/aoutos.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/cirrus.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/conix-elf.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/fpa.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/ieee754-df.S#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/ieee754-sf.S#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/iwmmxt.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/kaos-arm.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/kaos-strongarm.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/mmintrin.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-arm-aout#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-strongarm-coff#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/t-vxworks#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/t-wince-pe#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/unknown-elf-oabi.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/vxarm.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/arm/vxworks.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/wince-pe.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/freebsd3.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/freebsd4.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/freebsd5.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/freebsd6.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/frv/cmovd.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/cmovh.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/cmovw.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv-abi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv-asm.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frv.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frvbegin.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/frvend.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/lib1funcs.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/frv/t-frv#2 integrate .. //depot/projects/gdb/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/cygming.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/cygwin1.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/cygwin2.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/freebsd-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/kaos-i386.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/kfreebsdgnu.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/linux-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/lynx-ng.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/moss.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/netbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/nto.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/svr3dbx.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/svr3gas.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sysv3.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/t-beos#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/t-cygming#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/t-cygwin#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/t-interix#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/t-nto#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/t-sco5#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/t-vxworks#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/vsta.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/vxi386.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/i386/vxworks.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/win32.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/x-mingw32#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/xm-i386-interix.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/xm-vsta.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/aix.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/hpux_longdouble.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/itanium1.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/ia64/itanium2.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/t-aix#2 delete .. //depot/projects/gdb/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/unwind-aix.c#2 delete .. //depot/projects/gdb/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/kaos.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/kfreebsdgnu.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/linux-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/lynx-ng.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/psos.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/40x.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/440.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/603.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/6xx.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/7450.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/7xx.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/8540.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix31.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix3newas.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/altivec-defs.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/biarch64.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/darwin-ldouble.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/default64.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabiaix.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/host-darwin.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/kaos-ppc.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/libgcc-ppc64.ver#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/linuxspe.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/lynxbase.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/mach.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/mpc.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/power4.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/power5.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rios1.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/rios2.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs64.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-fprules#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-newas#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-ppcgas#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-rs6000#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-rs6000-c-rule#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-spe#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/t-vxworks#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/vxppc.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/rs6000/vxworks.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/x-darwin#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/x-linux64#1 branch .. //depot/projects/gdb/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/2064.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/s390/2084.md#1 branch .. //depot/projects/gdb/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/s390/t-tpf#1 branch .. //depot/projects/gdb/contrib/gcc/config/s390/tpf.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/bsd.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/hal.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/linux-aout.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/lite.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/litecoff.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/liteelf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/lynx-ng.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/lynx.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/netbsd.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/openbsd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/pbd.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-gld-bi.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-gld.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol26-sld.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sp64-aout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sp86x-aout.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/sp86x-elf.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/splet.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/sun4gas.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/sun4o3.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/sunos4.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sysv4-only.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/t-chorus-elf#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-halos#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-sol2#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/t-sparcbare#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-splet#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-sunos41#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-vxsparc#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/t-vxsparc64#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/vxsim.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/vxsparc.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/sparc/vxsparc64.h#2 delete .. //depot/projects/gdb/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-freebsd#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-gnu#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-interix#2 delete .. //depot/projects/gdb/contrib/gcc/config/t-kfreebsd-gnu#1 branch .. //depot/projects/gdb/contrib/gcc/config/t-libunwind#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-linux-aout#2 delete .. //depot/projects/gdb/contrib/gcc/config/t-netbsd#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-openbsd#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-rtems#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-slibgcc-darwin#1 branch .. //depot/projects/gdb/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/gdb/contrib/gcc/config/t-vxworks#1 branch .. //depot/projects/gdb/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/gdb/contrib/gcc/config/vxlib.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/vxworks.h#1 branch .. //depot/projects/gdb/contrib/gcc/config/windiss.h#1 branch .. //depot/projects/gdb/contrib/gcc/configure#2 integrate .. //depot/projects/gdb/contrib/gcc/configure.ac#1 branch .. //depot/projects/gdb/contrib/gcc/configure.frag#2 delete .. //depot/projects/gdb/contrib/gcc/configure.in#2 delete .. //depot/projects/gdb/contrib/gcc/conflict.c#2 integrate .. //depot/projects/gdb/contrib/gcc/convert.c#2 integrate .. //depot/projects/gdb/contrib/gcc/convert.h#2 integrate .. //depot/projects/gdb/contrib/gcc/coretypes.h#1 branch .. //depot/projects/gdb/contrib/gcc/coverage.c#1 branch .. //depot/projects/gdb/contrib/gcc/coverage.h#1 branch .. //depot/projects/gdb/contrib/gcc/cp-demangle.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp-demangle.h#1 branch .. //depot/projects/gdb/contrib/gcc/cp-demint.c#1 branch .. //depot/projects/gdb/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/ChangeLog.1#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/ChangeLog.2#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/ChangeLog.3#1 branch .. //depot/projects/gdb/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cfns.gperf#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/cxx-pretty-print.c#1 branch .. //depot/projects/gdb/contrib/gcc/cp/cxx-pretty-print.h#1 branch .. //depot/projects/gdb/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/lang-options.h#2 delete .. //depot/projects/gdb/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/lex.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/name-lookup.c#1 branch .. //depot/projects/gdb/contrib/gcc/cp/name-lookup.h#1 branch .. //depot/projects/gdb/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/parse.y#2 delete .. //depot/projects/gdb/contrib/gcc/cp/parser.c#1 branch .. //depot/projects/gdb/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/spew.c#2 delete .. //depot/projects/gdb/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cplus-dem.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppcharset.c#1 branch .. //depot/projects/gdb/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cpperror.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppexp.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpphash.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpplex.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpplib.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpplib.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cppmacro.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppmain.c#2 delete .. //depot/projects/gdb/contrib/gcc/cpppch.c#1 branch .. //depot/projects/gdb/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cpptrad.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cppucnid.h#1 branch .. //depot/projects/gdb/contrib/gcc/cppucnid.pl#1 branch .. //depot/projects/gdb/contrib/gcc/cppucnid.tab#1 branch .. //depot/projects/gdb/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cse.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cselib.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cselib.h#2 integrate .. //depot/projects/gdb/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/gdb/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/gdb/contrib/gcc/dbxstclass.h#2 delete .. //depot/projects/gdb/contrib/gcc/debug.c#2 integrate .. //depot/projects/gdb/contrib/gcc/debug.h#2 integrate .. //depot/projects/gdb/contrib/gcc/defaults.h#2 integrate .. //depot/projects/gdb/contrib/gcc/demangle.h#2 integrate .. //depot/projects/gdb/contrib/gcc/df.c#2 integrate .. //depot/projects/gdb/contrib/gcc/df.h#2 integrate .. //depot/projects/gdb/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/gdb/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/gdb/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/bugreport.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/configfiles.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/configterms.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/install-old.texi#2 delete .. //depot/projects/gdb/contrib/gcc/doc/install.texi#2 delete .. //depot/projects/gdb/contrib/gcc/doc/install.texi2html#2 delete .. //depot/projects/gdb/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/libgcc.texi#1 branch .. //depot/projects/gdb/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/dojump.c#1 branch .. //depot/projects/gdb/contrib/gcc/doloop.c#2 integrate .. //depot/projects/gdb/contrib/gcc/dominance.c#2 integrate .. //depot/projects/gdb/contrib/gcc/doschk.c#2 delete .. //depot/projects/gdb/contrib/gcc/dummy-conditions.c#2 integrate .. //depot/projects/gdb/contrib/gcc/dwarf2.h#2 integrate .. //depot/projects/gdb/contrib/gcc/dwarf2asm.c#2 integrate .. //depot/projects/gdb/contrib/gcc/dwarf2asm.h#2 integrate .. //depot/projects/gdb/contrib/gcc/dwarf2out.c#2 integrate .. //depot/projects/gdb/contrib/gcc/dwarf2out.h#2 integrate .. //depot/projects/gdb/contrib/gcc/emit-rtl.c#2 integrate .. //depot/projects/gdb/contrib/gcc/errors.c#2 integrate .. //depot/projects/gdb/contrib/gcc/errors.h#2 integrate .. //depot/projects/gdb/contrib/gcc/et-forest.c#2 integrate .. //depot/projects/gdb/contrib/gcc/et-forest.h#2 integrate .. //depot/projects/gdb/contrib/gcc/except.c#2 integrate .. //depot/projects/gdb/contrib/gcc/except.h#2 integrate .. //depot/projects/gdb/contrib/gcc/explow.c#2 integrate .. //depot/projects/gdb/contrib/gcc/expmed.c#2 integrate .. //depot/projects/gdb/contrib/gcc/expr.c#2 integrate .. //depot/projects/gdb/contrib/gcc/expr.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/gdb/contrib/gcc/f/Make-lang.in#2 integrate .. //depot/projects/gdb/contrib/gcc/f/README#2 delete .. //depot/projects/gdb/contrib/gcc/f/ansify.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/bad.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/bld.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/bld.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/bugs.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/com-rt.def#2 integrate .. //depot/projects/gdb/contrib/gcc/f/com.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/com.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/data.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/equiv.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/expr.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/ffe.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/fini.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/global.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/global.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/implic.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/info.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/intdoc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/intdoc.in#2 integrate .. //depot/projects/gdb/contrib/gcc/f/intdoc.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/intrin.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/invoke.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/lab.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/lab.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/lang-options.h#2 delete .. //depot/projects/gdb/contrib/gcc/f/lang-specs.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/lang.opt#1 branch .. //depot/projects/gdb/contrib/gcc/f/lex.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/malloc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/name.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/news.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/parse.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/proj.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/root.texi#2 integrate .. //depot/projects/gdb/contrib/gcc/f/src.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/st.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/sta.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stb.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stb.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stc.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/std.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/std.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/ste.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/ste.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/storag.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/storag.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/str.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stt.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/stw.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/symbol.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/symbol.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/target.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/target.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/top.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/top.h#2 integrate .. //depot/projects/gdb/contrib/gcc/f/type.c#2 integrate .. //depot/projects/gdb/contrib/gcc/f/where.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fibheap.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fibheap.h#2 integrate .. //depot/projects/gdb/contrib/gcc/filenames.h#1 branch .. //depot/projects/gdb/contrib/gcc/final.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fix-header.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fixproto#2 integrate .. //depot/projects/gdb/contrib/gcc/flags.h#2 integrate .. //depot/projects/gdb/contrib/gcc/floatlib.c#2 delete .. //depot/projects/gdb/contrib/gcc/flow.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/gdb/contrib/gcc/fp-test.c#2 integrate .. //depot/projects/gdb/contrib/gcc/function.c#2 integrate .. //depot/projects/gdb/contrib/gcc/function.h#2 integrate .. //depot/projects/gdb/contrib/gcc/future.options#2 delete .. //depot/projects/gdb/contrib/gcc/gbl-ctors.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gcc.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gcc.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gccbug.in#2 integrate .. //depot/projects/gdb/contrib/gcc/gccspec.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gcov-dump.c#1 branch .. //depot/projects/gdb/contrib/gcc/gcov-io.c#1 branch .. //depot/projects/gdb/contrib/gcc/gcov-io.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gcov-iov.c#1 branch .. //depot/projects/gdb/contrib/gcc/gcov.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gcse.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gdbinit.in#2 integrate .. //depot/projects/gdb/contrib/gcc/gen-protos.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genattr.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genattrtab.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genattrtab.h#2 integrate .. //depot/projects/gdb/contrib/gcc/genautomata.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gencheck.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gencodes.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genconditions.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genconfig.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genconstants.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genemit.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genextract.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genflags.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gengenrtl.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gengtype-lex.l#2 integrate .. //depot/projects/gdb/contrib/gcc/gengtype-yacc.y#2 integrate .. //depot/projects/gdb/contrib/gcc/gengtype.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gengtype.h#2 integrate .. //depot/projects/gdb/contrib/gcc/genmodes.c#1 branch .. //depot/projects/gdb/contrib/gcc/genmultilib#2 integrate .. //depot/projects/gdb/contrib/gcc/genopinit.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genoutput.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genpeep.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genpreds.c#2 integrate .. //depot/projects/gdb/contrib/gcc/genrecog.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gensupport.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gensupport.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/gdb/contrib/gcc/ggc-none.c#2 integrate .. //depot/projects/gdb/contrib/gcc/ggc-page.c#2 integrate .. //depot/projects/gdb/contrib/gcc/ggc-simple.c#2 integrate .. //depot/projects/gdb/contrib/gcc/ggc-zone.c#1 branch .. //depot/projects/gdb/contrib/gcc/ggc.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ginclude/float.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ginclude/iso646.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ginclude/stdarg.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ginclude/stdbool.h#2 integrate .. //depot/projects/gdb/contrib/gcc/ginclude/stddef.h#2 integrate .. //depot/projects/gdb/contrib/gcc/global.c#2 integrate .. //depot/projects/gdb/contrib/gcc/graph.c#2 integrate .. //depot/projects/gdb/contrib/gcc/graph.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-dce.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-gnat.c#1 branch .. //depot/projects/gdb/contrib/gcc/gthr-gnat.h#1 branch .. //depot/projects/gdb/contrib/gcc/gthr-posix.c#1 branch .. //depot/projects/gdb/contrib/gcc/gthr-posix.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-rtems.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-solaris.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-vxworks.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr-win32.h#2 integrate .. //depot/projects/gdb/contrib/gcc/gthr.h#2 integrate .. //depot/projects/gdb/contrib/gcc/haifa-sched.c#2 integrate .. //depot/projects/gdb/contrib/gcc/hard-reg-set.h#2 integrate .. //depot/projects/gdb/contrib/gcc/hashtab.c#2 integrate .. //depot/projects/gdb/contrib/gcc/hashtab.h#2 integrate .. //depot/projects/gdb/contrib/gcc/hashtable.c#2 integrate .. //depot/projects/gdb/contrib/gcc/hashtable.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 20 13:53:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5B5416A4D0; Fri, 20 Aug 2004 13:53:31 +0000 (GMT) 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 64D0A16A4CE for ; Fri, 20 Aug 2004 13:53:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4457B43D39 for ; Fri, 20 Aug 2004 13:53:31 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KDrVLX021624 for ; Fri, 20 Aug 2004 13:53:31 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KDrHnh021616 for perforce@freebsd.org; Fri, 20 Aug 2004 13:53:17 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 20 Aug 2004 13:53:17 GMT Message-Id: <200408201353.i7KDrHnh021616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60133 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: Fri, 20 Aug 2004 13:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=60133 Change 60133 by davidxu@davidxu_alona on 2004/08/20 13:52:50 IFC @60131 Affected files ... .. //depot/projects/davidxu_ksedbg/src/MAINTAINERS#5 integrate .. //depot/projects/davidxu_ksedbg/src/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/Makefile.inc1#4 integrate .. //depot/projects/davidxu_ksedbg/src/UPDATING#8 integrate .. //depot/projects/davidxu_ksedbg/src/bin/date/date.1#5 integrate .. //depot/projects/davidxu_ksedbg/src/bin/date/vary.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/bin/dd/args.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/bin/dd/dd.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/bin/dd/dd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/bin/dd/dd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/bin/dd/extern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gcc/pex-common.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gdb/gdb/infrun.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/ABOUT-NLS#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/AUTHORS#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/ChangeLog#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/NEWS#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/README#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/THANKS#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/TODO#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/argmatch.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/argmatch.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/closeout.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/closeout.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/dup-safer.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/error.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/fopen-safer.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/hard-locale.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/hard-locale.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/human.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/human.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/inttostr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/memcoll.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quotearg.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quotearg.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/stat-macros.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/version-etc.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xalloc-die.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xalloc.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xmalloc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xmemcoll.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtol.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtol.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtoumax.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/sort.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/system.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/RELNOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/client/dhclient.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/includes/version.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/omapip/test.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/libnetbsd/strsuftoll.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/ftpusers.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/FREEBSD-Xlist#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/cccust.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/unicust.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/BEGEMOT-ATM.txt#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/atm.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/atm_tree.def#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/snmp_atm.3#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/snmp_atm.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/snmp_atm/snmp_atm.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/crypto/openssl/crypto/engine/eng_padlock.c#1 branch .. //depot/projects/davidxu_ksedbg/src/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/davidxu_ksedbg/src/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/rc.d/jail#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/services#4 integrate .. //depot/projects/davidxu_ksedbg/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/davidxu_ksedbg/src/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/lib/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/lib/libgcov/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/cc/cc_int/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/amd64/init.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/grep/config.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gzip/inflate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/config.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/include/Makefile#8 integrate .. //depot/projects/davidxu_ksedbg/src/include/_ctype.h#1 branch .. //depot/projects/davidxu_ksedbg/src/include/complex.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/ctype.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/wchar.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/include/wctype.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/alpha/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/amd64/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/arm/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/i386-elf/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/ia64/crt1.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/powerpc/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/csu/sparc64/crt1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/configure.ac.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/snmp_atm/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libbsnmp/modules/snmp_atm/atm_sys.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/alpha/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/alpha/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/amd64/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/tls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/i386/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/i386/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/ia64/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/ia64/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/wcwidth.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/powerpc/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/powerpc/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/rpc/clnt_vc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sparc64/gen/Makefile.inc#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sparc64/gen/_set_tp.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/mount.2#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc_r/uthread/uthread_write.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc_r/uthread/uthread_writev.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libmagic/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/alpha/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/include/pthread_md.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#11 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_symbols.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libthr/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/libexec/lukemftpd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/libexec/tftpd/tftpd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/readme/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/powerpc/boot.tbxi#1 branch .. //depot/projects/davidxu_ksedbg/src/release/powerpc/boot_crunch.conf#1 branch .. //depot/projects/davidxu_ksedbg/src/release/powerpc/hfs.map#1 branch .. //depot/projects/davidxu_ksedbg/src/release/powerpc/mkisoimages.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/release/scripts/doFS.sh#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/scripts/print-cdrom-packages.sh#5 integrate .. //depot/projects/davidxu_ksedbg/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atm_oid.list#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atmconfig.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atmconfig.help#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atmconfig_device.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atmconfig_device.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/atmconfig_device.help#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/main.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/atm/atmconfig/private.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#5 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/mirror/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/mirror/gmirror.8#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/raid3/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/raid3/geom_raid3.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/raid3/graid3.8#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/geom_stripe.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/core/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#5 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/ping/ping.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/routed/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/routed/if.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/routed/rtquery/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/etc/make.conf#5 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/mdoc/example.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/ses/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man3/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man3/tgmath.3#1 branch .. //depot/projects/davidxu_ksedbg/src/share/man/man4/aac.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/aha.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/dc.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/de.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/gem.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/hfa.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/hme.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/inet.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ipfirewall.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ixgb.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mlx.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mly.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ncr.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ncv.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/rc.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/rl.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/rue.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/sk.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/sym.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/trm.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/twa.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/twe.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/umct.4#5 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/umodem.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/uscanner.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/vr.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/make.conf.5#5 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/build.7#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/hier.7#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/release.7#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/MUTEX_PROFILING.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/altq.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/contigmalloc.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/printf.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vslock.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.README#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/sys.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/linux/linux.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/common/help.common#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/powerpc/loader/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.amd64#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.ia64#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.pc98#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options.amd64#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options.i386#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options.ia64#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options.pc98#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/FREEBSD-Xlist#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_dump.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_user.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/unistruct.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_call.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_coord.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_party.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_print.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_reset.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcibvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/ahc_isa.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/eisa/eisaconf.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/ofw_bus.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/ofw_bus_if.m#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pccbb/pccbb_isa.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/pccbb/pccbb_pci.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pcf/pcfvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sab/sab.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/twa/twa_freebsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/twa/twa_reg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/urio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/zs/zs_sbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_slice.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_toshiba.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/mp_watchdog.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/mp_watchdog.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/pcb.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/pte.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/isa/psm.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/device_if.m#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_main.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#16 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_physio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#15 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_switch.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/aic7xxx/ahc/ahc_isa/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/cbb/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/esp/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/geom/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/geom/geom_raid3/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/geom/geom_uzip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/hme/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/isp/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/atm/ccatm/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/bpf.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/bridge.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_media.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_tap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_var.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/route.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/rtsock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/atm/ccatm/ng_ccatm.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/atm/ng_ccatm.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/if_atm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/if_atm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/igmp.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw_pfil.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcpip.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pccard/i82365.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pccard/pcic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pccard/pcic_isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp_amd64.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp_via.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agpreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dc.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_de.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rl.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sk.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_skreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/memdev.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/maciovar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/locore.S#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/mem.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhcvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/eeprom.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/ofw_bus.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/eeprom_ebus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/eeprom_sbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/ofw_bus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/uio_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/bio.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/event.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/eventvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#11 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/selinfo.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/socket.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/vnode.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_kern.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/atm/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/atm/RunTest.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/atm/proto_cc/RunTest.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/runtests.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-1.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-2.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-3.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-4.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-5.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-6.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-7.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-8.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_raid3/test-9.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/.cvsignore#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/etalon/etalon.txt#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/runtests.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/test-1.img.gz.uue#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/test-1.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/geom_uzip/test-2.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/regression/p1003_1b/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/tls/ttls3/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/regression/usr.bin/make/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/customize.sh#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/i386.diskimage#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/localfiles#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/raidtest/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/raidtest/README#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/raidtest/raidtest.c#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/default.rc#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/releng_4.rc#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/releng_5.rc#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/update_releng_4.rc#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/etc/update_releng_5.rc#1 branch .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/tbmaster.pl#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/tinderbox/tinderbox.pl#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/calendar.all#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/calendar.hungarian#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/file/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/lam/lam.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/m4/eval.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/m4/extern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/m4/main.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/main.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/make.1#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/nonints.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/var.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/TEST/sed.test#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/compile.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/defs.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/extern.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/main.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/misc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/process.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#7 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#10 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpiconf/acpiconf.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpi.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpidump.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpidump.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/bluetooth/bcmfw/bcmfw.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/bluetooth/hccontrol/link_control.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/eeprom/ofw_options.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/i4b/isdnd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/i4b/isdnmonitor/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/floppy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/sysinstall.8#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/tzsetup/tzsetup.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/watch/watch.c#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/MAINTAINERS#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.98 2004/08/05 21:01:27 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $ subsystem login notes ----------------------------- @@ -96,6 +96,7 @@ geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. geom_nop pjd Pre-commit review preferred. +geom_raid3 pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 20 13:58:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7528F16A4D0; Fri, 20 Aug 2004 13:58:39 +0000 (GMT) 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 4F54216A4CE for ; Fri, 20 Aug 2004 13:58:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3226D43D3F for ; Fri, 20 Aug 2004 13:58:39 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KDwdTR021814 for ; Fri, 20 Aug 2004 13:58:39 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KDwcw1021811 for perforce@freebsd.org; Fri, 20 Aug 2004 13:58:38 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 20 Aug 2004 13:58:38 GMT Message-Id: <200408201358.i7KDwcw1021811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60134 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: Fri, 20 Aug 2004 13:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=60134 Change 60134 by davidxu@davidxu_alona on 2004/08/20 13:57:38 Adjust code to support statically linked thread binary. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#19 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#19 (text+ko) ==== @@ -46,16 +46,19 @@ pid_t pid; }; +extern int child_suppress_run; + extern struct target_ops child_ops; /* This module's target vector. */ static struct target_ops thread_db_ops; -static struct target_ops base_ops; - /* Pointer to the next function on the objfile event chain. */ static void (*target_new_objfile_chain) (struct objfile *objfile); +/* Non-zero if there is a thread module */ +static int fbsd_thread_present; + /* Non-zero if we're using this module's target vector. */ static int using_thread_db; @@ -78,6 +81,7 @@ static td_err_e (*td_init_p) (void); static td_err_e (*td_ta_new_p) (struct ps_prochandle *ps, td_thragent_t **ta); +static td_err_e (*td_ta_delete_p) (td_thragent_t *); static td_err_e (*td_ta_map_id2thr_p) (const td_thragent_t *ta, thread_t pt, td_thrhandle_t *__th); static td_err_e (*td_ta_map_lwp2thr_p) (const td_thragent_t *ta, lwpid_t lwpid, @@ -119,6 +123,7 @@ /* Prototypes for local functions. */ static void fbsd_thread_find_new_threads (void); static int fbsd_thread_alive (ptid_t ptid); +static void fbsd_thread_activate(void); /* Building process ids. */ @@ -222,13 +227,16 @@ gdb_assert (IS_LWP (ptid)); - err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); - if (err == TD_OK) + if (using_thread_db) { - err = td_thr_get_info_p (&th, &ti); - if (err != TD_OK) - error ("Cannot get thread info: %s", thread_db_err_str (err)); - return BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); + if (err == TD_OK) + { + err = td_thr_get_info_p (&th, &ti); + if (err != TD_OK) + error ("Cannot get thread info: %s", thread_db_err_str (err)); + return BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + } } /* the LWP is not mapped to user thread */ @@ -269,22 +277,22 @@ /* Don't attempt to use thread_db on targets which can not run (core files). */ - if (objfile == NULL || !target_has_execution) + if (objfile == NULL) { /* All symbols have been discarded. If the thread_db target is active, deactivate it now. */ if (using_thread_db) { gdb_assert (proc_handle.pid == 0); - unpush_target (&thread_db_ops); using_thread_db = 0; } - keep_thread_db = 0; - goto quit; } + if (!child_suppress_run) + goto quit; + if (using_thread_db) /* Nothing to do. The thread library was already detected and the target vector was already activated. */ @@ -305,32 +313,22 @@ case TD_OK: /* The thread library was detected. Activate the thread_db target. */ - base_ops = current_target; - push_target (&thread_db_ops); - using_thread_db = 1; + fbsd_thread_present = 1; - /* If the thread library was detected in the main symbol file - itself, we assume that the program was statically linked - against the thread library and well have to keep this - module's target vector activated until forever... Well, at - least until all symbols have been discarded anyway (see - above). */ - if (objfile == symfile_objfile) - { - gdb_assert (proc_handle.pid == 0); - keep_thread_db = 1; - } - /* We can only poke around if there actually is a child process. If there is no child process alive, postpone the steps below until one has been created. */ if (proc_handle.pid != 0) { - fbsd_thread_find_new_threads (); - get_current_thread (); + push_target(&thread_db_ops); + fbsd_thread_activate(); } else - printf_filtered("%s postpone processing\n", __func__); + { + td_ta_delete_p(thread_agent); + thread_agent = NULL; + printf_filtered("%s postpone processing\n", __func__); + } break; default: @@ -403,9 +401,9 @@ GET_THREAD(inferior_ptid)); #endif - if (proc_handle.pid == 0) + if (!using_thread_db) { - base_ops.to_resume (ptid, step, signo); + child_ops.to_resume (ptid, step, signo); return; } @@ -502,7 +500,7 @@ ret = child_ops.to_wait (ptid, ourstatus); if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { - lwp = get_current_lwp (proc_handle.pid); + lwp = get_current_lwp (GET_PID(ret)); ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); if (!in_thread_list (ret)) add_thread (ret); @@ -525,7 +523,7 @@ fbsd_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { - return base_ops.to_xfer_memory (memaddr, myaddr, len, write, + return child_ops.to_xfer_memory (memaddr, myaddr, len, write, attrib, target); } @@ -536,7 +534,6 @@ fpregset_t fpregs; lwpid_t lwp; - /* FIXME, use base_ops to fetch lwp registers! */ lwp = GET_LWP (inferior_ptid); if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1) @@ -675,14 +672,26 @@ child_ops.to_kill(); } +static int +fbsd_thread_can_run (void) +{ + return child_suppress_run; +} + static void +fbsd_thread_activate (void) +{ + using_thread_db = 1; + init_thread_list(); + fbsd_thread_find_new_threads (); + get_current_thread (); +} + +static void fbsd_thread_create_inferior (char *exec_file, char *allargs, char **env) { - if (!keep_thread_db) - { - unpush_target (&thread_db_ops); - using_thread_db = 0; - } + if (fbsd_thread_present && !using_thread_db) + push_target(&thread_db_ops); child_ops.to_create_inferior (exec_file, allargs, env); } @@ -690,16 +699,15 @@ static void fbsd_thread_post_startup_inferior (ptid_t ptid) { - if (proc_handle.pid == 0) + if (fbsd_thread_present && !using_thread_db) { /* * The child process is now the actual multi-threaded * program. Snatch its process ID... */ proc_handle.pid = GET_PID (ptid); - - fbsd_thread_find_new_threads (); - get_current_thread (); + td_ta_new_p (&proc_handle, &thread_agent); + fbsd_thread_activate(); } } @@ -745,14 +753,17 @@ return 1; } - err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); + if (using_thread_db) + { + err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); - /* - * if the lwp was already mapped to user thread, don't use it - * directly, please use user thread id instead. - */ - if (err == TD_OK) - return 0; + /* + * if the lwp was already mapped to user thread, don't use it + * directly, please use user thread id instead. + */ + if (err == TD_OK) + return 0; + } /* check lwp in kernel */ return ptrace (PT_GETREGS, GET_LWP (ptid), (caddr_t)&gregs, 0) == 0; @@ -786,6 +797,9 @@ { td_err_e err; + if (!using_thread_db) + return; + /* Iterate over all user-space threads to discover new threads. */ err = td_ta_thr_iter_p (thread_agent, find_new_threads_callback, NULL, TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, @@ -908,7 +922,8 @@ static void fbsd_thread_tsd_cmd (char *exp, int from_tty) { - td_ta_tsd_iter_p (thread_agent, tsd_cb, NULL); + if (using_thread_db) + td_ta_tsd_iter_p (thread_agent, tsd_cb, NULL); } static void @@ -928,11 +943,17 @@ thread_db_ops.to_create_inferior = fbsd_thread_create_inferior; thread_db_ops.to_post_startup_inferior = fbsd_thread_post_startup_inferior; thread_db_ops.to_mourn_inferior = fbsd_thread_mourn_inferior; + thread_db_ops.to_can_run = fbsd_thread_can_run; thread_db_ops.to_thread_alive = fbsd_thread_alive; thread_db_ops.to_find_new_threads = fbsd_thread_find_new_threads; thread_db_ops.to_pid_to_str = fbsd_thread_pid_to_str; thread_db_ops.to_stratum = thread_stratum; thread_db_ops.to_has_thread_control = tc_none; + thread_db_ops.to_has_all_memory = 1; + thread_db_ops.to_has_memory = 1; + thread_db_ops.to_has_stack = 1; + thread_db_ops.to_has_registers = 1; + thread_db_ops.to_has_execution = 1; thread_db_ops.to_insert_breakpoint = memory_insert_breakpoint; thread_db_ops.to_remove_breakpoint = memory_remove_breakpoint; thread_db_ops.to_get_thread_local_address = fbsd_thread_get_local_address; @@ -957,6 +978,10 @@ if (td_ta_new_p == NULL) return 0; + td_ta_delete_p = dlsym (handle, "td_ta_delete"); + if (td_ta_delete_p == NULL) + return 0; + td_ta_map_id2thr_p = dlsym (handle, "td_ta_map_id2thr"); if (td_ta_map_id2thr_p == NULL) return 0; @@ -1045,6 +1070,7 @@ { printf_filtered("%s: can not load %s.\n", __func__, LIBTHREAD_DB_SO); } + child_suppress_run = 1; } /* proc service functions */ @@ -1075,14 +1101,16 @@ ps_err_e ps_pread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) { - return target_read_memory ((CORE_ADDR) addr, buf, len); + int err = target_read_memory ((CORE_ADDR) addr, buf, len); + return (err == 0 ? PS_OK : PS_ERR); } ps_err_e ps_pwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, size_t len) { - return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); + int err = target_write_memory ((CORE_ADDR) addr, (void *)buf, len); + return (err == 0 ? PS_OK : PS_ERR); } ps_err_e From owner-p4-projects@FreeBSD.ORG Fri Aug 20 14:01:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C694C16A4D0; Fri, 20 Aug 2004 14:01:43 +0000 (GMT) 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 8927416A4CE for ; Fri, 20 Aug 2004 14:01:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B51943D53 for ; Fri, 20 Aug 2004 14:01:43 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KE1hS3021935 for ; Fri, 20 Aug 2004 14:01:43 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KE1hls021932 for perforce@freebsd.org; Fri, 20 Aug 2004 14:01:43 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 20 Aug 2004 14:01:43 GMT Message-Id: <200408201401.i7KE1hls021932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60135 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: Fri, 20 Aug 2004 14:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=60135 Change 60135 by davidxu@davidxu_alona on 2004/08/20 14:00:48 Style fix. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#20 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#20 (text+ko) ==== @@ -326,7 +326,7 @@ else { td_ta_delete_p(thread_agent); - thread_agent = NULL; + thread_agent = NULL; printf_filtered("%s postpone processing\n", __func__); } break; From owner-p4-projects@FreeBSD.ORG Fri Aug 20 17:10:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1D9F16A4D0; Fri, 20 Aug 2004 17:10:40 +0000 (GMT) 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 AEAB216A4CE for ; Fri, 20 Aug 2004 17:10:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E93D43D2D for ; Fri, 20 Aug 2004 17:10:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KHAei2030997 for ; Fri, 20 Aug 2004 17:10:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KHAbUd030982 for perforce@freebsd.org; Fri, 20 Aug 2004 17:10:37 GMT (envelope-from jhb@freebsd.org) Date: Fri, 20 Aug 2004 17:10:37 GMT Message-Id: <200408201710.i7KHAbUd030982@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 60151 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: Fri, 20 Aug 2004 17:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=60151 Change 60151 by jhb@jhb_slimer on 2004/08/20 17:10:02 IFC @60147. Affected files ... .. //depot/projects/smpng/sys/Makefile#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#14 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#62 integrate .. //depot/projects/smpng/sys/alpha/linux/linux.h#8 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#19 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#7 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/smpng/sys/amd64/isa/isa.h#3 integrate .. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/smpng/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/smpng/sys/boot/Makefile#16 integrate .. //depot/projects/smpng/sys/boot/common/help.common#13 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#29 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#7 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#8 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#17 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#20 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#54 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#15 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#11 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#39 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#34 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.h#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#49 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#14 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#19 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#19 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#23 integrate .. //depot/projects/smpng/sys/conf/NOTES#77 integrate .. //depot/projects/smpng/sys/conf/files#117 integrate .. //depot/projects/smpng/sys/conf/files.amd64#21 integrate .. //depot/projects/smpng/sys/conf/files.i386#67 integrate .. //depot/projects/smpng/sys/conf/files.ia64#44 integrate .. //depot/projects/smpng/sys/conf/files.pc98#63 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#21 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#42 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#38 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#33 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#13 integrate .. //depot/projects/smpng/sys/conf/options#84 integrate .. //depot/projects/smpng/sys/conf/options.amd64#8 integrate .. //depot/projects/smpng/sys/conf/options.i386#42 integrate .. //depot/projects/smpng/sys/conf/options.ia64#19 integrate .. //depot/projects/smpng/sys/conf/options.pc98#40 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#11 integrate .. //depot/projects/smpng/sys/contrib/ngatm/FREEBSD-Xlist#1 branch .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_dump.c#2 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_user.c#2 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/unistruct.h#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_call.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_coord.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_party.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_print.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_reset.c#3 integrate .. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_uni.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#42 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#12 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#21 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#32 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#13 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#24 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#22 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#71 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#22 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#46 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#1 branch .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#21 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#22 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amrio.h#4 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#15 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#38 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#16 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#20 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#35 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#10 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#11 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#23 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#9 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#13 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#12 integrate .. //depot/projects/smpng/sys/dev/exca/excavar.h#6 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/fdc/fdcreg.h#2 delete .. //depot/projects/smpng/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#14 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#24 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#54 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#20 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#18 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#10 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#6 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#11 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#23 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#11 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#34 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus.h#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_if.m#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#12 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#8 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#6 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#10 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#6 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#28 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#46 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#1 branch .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#1 branch .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#13 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/pcf/pcfvar.h#3 integrate .. //depot/projects/smpng/sys/dev/pcic/i82365.c#10 delete .. //depot/projects/smpng/sys/dev/pcic/i82365_isa.c#5 delete .. //depot/projects/smpng/sys/dev/pcic/i82365reg.h#2 delete .. //depot/projects/smpng/sys/dev/pcic/i82365var.h#2 delete .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#12 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#3 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#14 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#21 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#16 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#10 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#16 integrate .. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#4 integrate .. //depot/projects/smpng/sys/dev/twa/twa_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#19 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#22 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#40 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#59 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#25 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#16 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxreg.h#4 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#3 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#19 integrate .. //depot/projects/smpng/sys/dev/zs/zs_macio.c#5 integrate .. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#6 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#18 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#31 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#30 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#22 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#6 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#6 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#29 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#54 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#87 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#66 integrate .. //depot/projects/smpng/sys/i386/i386/mp_watchdog.c#1 branch .. //depot/projects/smpng/sys/i386/include/mp_watchdog.h#1 branch .. //depot/projects/smpng/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#8 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#83 integrate .. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/unwind.c#12 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#16 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#11 integrate .. //depot/projects/smpng/sys/isa/psm.c#28 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#10 integrate .. //depot/projects/smpng/sys/kern/device_if.m#3 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#39 integrate .. //depot/projects/smpng/sys/kern/init_main.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#64 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#33 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#33 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#47 integrate .. //depot/projects/smpng/sys/kern/tty.c#46 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#29 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#55 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#36 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#58 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#48 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#49 integrate .. //depot/projects/smpng/sys/modules/Makefile#80 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_isa/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cbb/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/esp/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/geom/geom_raid3/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_uzip/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hme/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ip_mroute_mod/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/isp/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/ccatm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pf/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/uart/Makefile#5 integrate .. //depot/projects/smpng/sys/net/bpf.c#39 integrate .. //depot/projects/smpng/sys/net/bridge.c#28 integrate .. //depot/projects/smpng/sys/net/if.c#52 integrate .. //depot/projects/smpng/sys/net/if_media.h#13 integrate .. //depot/projects/smpng/sys/net/if_tap.c#28 integrate .. //depot/projects/smpng/sys/net/if_var.h#30 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#31 integrate .. //depot/projects/smpng/sys/net/route.c#23 integrate .. //depot/projects/smpng/sys/net/rtsock.c#37 integrate .. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#6 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_message.h#9 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#7 integrate .. //depot/projects/smpng/sys/netinet/if_atm.c#7 integrate .. //depot/projects/smpng/sys/netinet/if_atm.h#4 integrate .. //depot/projects/smpng/sys/netinet/igmp.h#3 integrate .. //depot/projects/smpng/sys/netinet/in.c#21 integrate .. //depot/projects/smpng/sys/netinet/in.h#27 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#32 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#16 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#32 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#14 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_gre.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#56 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#35 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#7 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#61 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#23 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#42 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.h#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#58 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#53 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/smpng/sys/netinet/tcpip.h#3 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#47 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#6 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#7 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#33 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/smpng/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#33 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#33 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#12 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#16 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#28 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/smpng/sys/pccard/i82365.h#10 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#25 integrate .. //depot/projects/smpng/sys/pccard/pcic_isa.c#10 integrate .. //depot/projects/smpng/sys/pci/agp.c#22 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#14 integrate .. //depot/projects/smpng/sys/pci/agp_amd64.c#1 branch .. //depot/projects/smpng/sys/pci/agp_sis.c#10 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#13 integrate .. //depot/projects/smpng/sys/pci/agpreg.h#11 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#58 integrate .. //depot/projects/smpng/sys/pci/if_de.c#19 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#35 integrate .. //depot/projects/smpng/sys/pci/if_skreg.h#7 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#30 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/smpng/sys/powerpc/include/memdev.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#4 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mem.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofwmagic.S#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#45 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobus.c#6 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/central/central.c#3 integrate .. //depot/projects/smpng/sys/sparc64/central/centralvar.h#2 delete .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#44 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#16 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebusvar.h#3 delete .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_central.c#3 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_nexus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhcvar.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/eeprom.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#27 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#9 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#8 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci_if.m#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.h#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#34 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbusvar.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_fhc.c#6 delete .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#64 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#52 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/smpng/sys/sys/bio.h#21 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#26 integrate .. //depot/projects/smpng/sys/sys/event.h#13 integrate .. //depot/projects/smpng/sys/sys/eventvar.h#3 integrate .. //depot/projects/smpng/sys/sys/fdcio.h#3 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#23 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#8 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#42 integrate .. //depot/projects/smpng/sys/sys/param.h#68 integrate .. //depot/projects/smpng/sys/sys/proc.h#123 integrate .. //depot/projects/smpng/sys/sys/selinfo.h#8 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/smpng/sys/sys/socket.h#23 integrate .. //depot/projects/smpng/sys/sys/vnode.h#47 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#37 integrate .. //depot/projects/smpng/sys/vm/vm.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#66 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#32 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#18 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#41 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#7 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/sys/Makefile,v 1.30 2004/05/16 00:19:12 cognet Exp $ +# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ # The boot loader +.if !defined(NO_BOOT) .if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif +.endif # Loadable kernel modules .if defined(MODULES_WITH_WORLD) ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.18 2004/05/16 20:00:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $"); #include #include @@ -106,6 +106,13 @@ &freebsd_brand_oinfo); +void +elf64_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#62 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.165 2004/08/04 18:04:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.166 2004/08/15 20:54:25 alc Exp $"); #include #include @@ -2173,7 +2173,7 @@ /* * this routine is used to modify bits in ptes */ -static void +static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem) { pv_entry_t pv; @@ -2410,7 +2410,7 @@ pmap_emulate_reference(struct vmspace *vm, vm_offset_t v, int user, int write) { pmap_t pmap; - pt_entry_t faultoff, *pte; + pt_entry_t *pte; /* * Convert process and virtual address to physical address. @@ -2427,32 +2427,15 @@ PMAP_LOCK(pmap); pte = pmap_lev3pte(pmap, v); } -#ifdef INVARIANTS /* These checks are more expensive */ - if (!pmap_pte_v(pte)) - panic("pmap_emulate_reference: invalid pte"); -#if 0 + /* - * Can't do these, because cpu_fork and cpu_swapin call - * pmap_emulate_reference(), and the bits aren't guaranteed, - * for them... + * Another CPU can modify the pmap between the emulation trap and this + * CPU locking the pmap. As a result, the pte may be inconsistent + * with the access that caused the emulation trap. In such cases, + * invalidate this CPU's TLB entry and return. */ - if (write) { - if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE))) - panic("pmap_emulate_reference: write but unwritable"); - if (!(*pte & PG_FOW)) - panic("pmap_emulate_reference: write but not FOW"); - } else { - if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE))) - panic("pmap_emulate_reference: !write but unreadable"); - if (!(*pte & (PG_FOR | PG_FOE))) - panic("pmap_emulate_reference: !write but not FOR|FOE"); - } -#endif - /* Other diagnostics? */ -#endif - KASSERT((*pte & PG_MANAGED) != 0, - ("pmap_emulate_reference(%p, 0x%lx, %d, %d): pa 0x%lx not managed", - curthread, v, user, write, pmap_pte_pa(pte))); + if (!pmap_pte_v(pte)) + goto tbis; /* * Twiddle the appropriate bits to reflect the reference @@ -2463,12 +2446,19 @@ * (2) if it was a write fault, mark page as modified. */ if (write) { - faultoff = PG_FOR | PG_FOE | PG_FOW; + if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE))) + goto tbis; + if (!(*pte & PG_FOW)) + goto tbis; + *pte &= ~(PG_FOR | PG_FOE | PG_FOW); } else { - faultoff = PG_FOR | PG_FOE; + if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE))) + goto tbis; + if (!(*pte & (PG_FOR | PG_FOE))) + goto tbis; + *pte &= ~(PG_FOR | PG_FOE); } - - *pte = (*pte & ~faultoff); +tbis: ALPHA_TBIS(v); PMAP_UNLOCK(pmap); } ==== //depot/projects/smpng/sys/alpha/linux/linux.h#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.58 2003/04/16 20:04:47 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.59 2004/08/16 07:05:44 tjr Exp $ */ #ifndef _ALPHA_LINUX_LINUX_H_ @@ -45,6 +45,9 @@ MALLOC_DECLARE(M_LINUX); #endif +#define PTRIN(v) (void *)(v) +#define PTROUT(v) (l_uintptr_t)(v) + typedef int l_int; typedef int64_t l_long; typedef int64_t l_longlong; @@ -55,6 +58,7 @@ typedef unsigned short l_ushort; typedef char *l_caddr_t; +typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; typedef l_uint l_dev_t; ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); #include #include @@ -40,8 +40,7 @@ { struct acpi_softc *sc; - sc = device_get_softc(dev); - + sc = devclass_get_softc(devclass_find("acpi"), 0); acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.56 2004/07/08 01:28:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.57 2004/08/16 22:53:03 peter Exp $"); #include #include @@ -526,7 +526,7 @@ if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) || dmat->boundary > 0 || dmat->alignment > 1) - && map->pagesneeded == 0) { + && map != &nobounce_dmamap && map->pagesneeded == 0) { vm_offset_t vendaddr; /* ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#12 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.150 2004/05/16 22:43:57 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $ */ #include @@ -53,7 +53,7 @@ /* * cpu_throw() * - * This is the second half of cpu_swtch(). It is used when the current + * This is the second half of cpu_switch(). It is used when the current * thread is either a dummy or slated to die, and we no longer care * about its state. This is only a slight optimization and is probably * not worth it anymore. Note that we need to clear the pm_active bits so ==== //depot/projects/smpng/sys/amd64/amd64/db_interface.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.79 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.80 2004/08/16 23:10:46 peter Exp $"); /* * Interface to new debugger. @@ -33,11 +33,9 @@ #include #include #include -#include #include #include #include -#include #include ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.21 2004/05/17 21:16:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.22 2004/08/11 02:35:04 marcel Exp $"); #include #include @@ -102,6 +102,14 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); + +void +elf64_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#10 (text+ko) ==== @@ -27,11 +27,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.119 2004/05/24 12:42:16 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.120 2004/08/16 12:51:32 obrien Exp $ */ #include "opt_atpic.h" -#include "opt_ia32.h" +#include "opt_compat.h" #include #include @@ -307,7 +307,7 @@ * included. */ -#ifdef IA32 +#ifdef COMPAT_IA32 .data .p2align 4 .text ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#5 (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/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ */ /* @@ -212,8 +212,7 @@ * For stray and threaded interrupts, we mask and EOI the * source. */ - isrc->is_pic->pic_disable_source(isrc); - isrc->is_pic->pic_eoi_source(isrc); + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); if (ih == NULL) error = EINVAL; else ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.10 2004/07/08 01:42:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -119,7 +119,7 @@ static const char *ioapic_bus_string(int bus_type); static void ioapic_print_vector(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); -static void ioapic_disable_source(struct intsrc *isrc); +static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); @@ -148,6 +148,12 @@ #endif TUNABLE_INT("hw.apic.mixed_mode", &mixed_mode_active); +static __inline void +_ioapic_eoi_source(struct intsrc *isrc) +{ + lapic_eoi(); +} + static u_int ioapic_read(volatile ioapic_t *apic, int reg) { @@ -225,7 +231,7 @@ } static void -ioapic_disable_source(struct intsrc *isrc) +ioapic_disable_source(struct intsrc *isrc, int eoi) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; @@ -240,6 +246,10 @@ flags); intpin->io_masked = 1; } + + if (eoi == PIC_EOI) + _ioapic_eoi_source(isrc); + mtx_unlock_spin(&icu_lock); } @@ -247,7 +257,7 @@ ioapic_eoi_source(struct intsrc *isrc) { - lapic_eoi(); + _ioapic_eoi_source(isrc); } /* ==== //depot/projects/smpng/sys/amd64/amd64/legacy.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -51,7 +51,6 @@ static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device"); struct legacy_device { - struct resource_list lg_resources; int lg_pcibus; }; @@ -63,15 +62,8 @@ static int legacy_print_child(device_t, device_t); static device_t legacy_add_child(device_t bus, int order, const char *name, int unit); -static struct resource *legacy_alloc_resource(device_t, device_t, int, int *, - u_long, u_long, u_long, u_int); static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); static int legacy_write_ivar(device_t, device_t, int, uintptr_t); -static int legacy_release_resource(device_t, device_t, int, int, - struct resource *); -static int legacy_set_resource(device_t, device_t, int, int, u_long, u_long); -static int legacy_get_resource(device_t, device_t, int, int, u_long *, u_long *); -static void legacy_delete_resource(device_t, device_t, int, int); static device_method_t legacy_methods[] = { /* Device interface */ @@ -88,11 +80,8 @@ DEVMETHOD(bus_add_child, legacy_add_child), DEVMETHOD(bus_read_ivar, legacy_read_ivar), DEVMETHOD(bus_write_ivar, legacy_write_ivar), - DEVMETHOD(bus_set_resource, legacy_set_resource), - DEVMETHOD(bus_get_resource, legacy_get_resource), - DEVMETHOD(bus_alloc_resource, legacy_alloc_resource), - DEVMETHOD(bus_release_resource, legacy_release_resource), - DEVMETHOD(bus_delete_resource, legacy_delete_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -183,30 +172,12 @@ } static int -legacy_print_all_resources(device_t dev) -{ - struct legacy_device *atdev = DEVTOAT(dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 20 17:12:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F0A516A4D0; Fri, 20 Aug 2004 17:12:44 +0000 (GMT) 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 A7E9F16A4CF for ; Fri, 20 Aug 2004 17:12:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83F2743D5C for ; Fri, 20 Aug 2004 17:12:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KHChpv031124 for ; Fri, 20 Aug 2004 17:12:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KHChES031121 for perforce@freebsd.org; Fri, 20 Aug 2004 17:12:43 GMT (envelope-from jhb@freebsd.org) Date: Fri, 20 Aug 2004 17:12:43 GMT Message-Id: <200408201712.i7KHChES031121@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 60152 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: Fri, 20 Aug 2004 17:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=60152 Change 60152 by jhb@jhb_slimer on 2004/08/20 17:11:42 IFC @60150. Affected files ... .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.28 2004/08/13 06:22:13 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.30 2004/08/20 17:04:49 njl Exp $"); #include "opt_acpi.h" #include @@ -504,6 +504,51 @@ void *ar_parent; }; +/* + * Add a resource to the device's resource list. We define our own function + * for this since bus_set_resource() doesn't handle duplicates of any kind. + * + * XXX This should be merged into resource_list_add() eventually. + */ +static int +acpi_reslist_add(device_t dev, int type, int rid, u_long start, u_long count) +{ + struct resource_list_entry *rle; + struct resource_list *rl; + u_long end; + + end = start + count - 1; + rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + + /* + * Loop through all current resources to see if the new one overlaps + * any existing ones. If so, the old one always takes precedence and + * the new one is adjusted (or rejected). We check for three cases: + * + * 1. Tail of new resource overlaps head of old resource: truncate the + * new resource so it is contiguous with the start of the old. + * 2. New resource wholly contained within the old resource: error. + * 3. Head of new resource overlaps tail of old resource: truncate the + * new resource so it is contiguous, following the old. + */ + SLIST_FOREACH(rle, rl, link) { + if (rle->type == type) { + if (start < rle->start && end >= rle->start) { + count = rle->start - start; + break; + } else if (start >= rle->start && start <= rle->end) { + if (end > rle->end) { + start = rle->end + 1; + count = end - start + 1; + break; + } else + return (EEXIST); + } + } + } + return (bus_set_resource(dev, type, rid, start, count)); +} + static void acpi_res_set_init(device_t dev, void *arg, void **context) { @@ -534,7 +579,7 @@ if (cp == NULL) return; - bus_set_resource(dev, SYS_RES_IOPORT, cp->ar_nio++, base, length); + acpi_reslist_add(dev, SYS_RES_IOPORT, cp->ar_nio++, base, length); } static void @@ -557,7 +602,7 @@ if (cp == NULL) return; - bus_set_resource(dev, SYS_RES_MEMORY, cp->ar_nmem++, base, length); + acpi_reslist_add(dev, SYS_RES_MEMORY, cp->ar_nmem++, base, length); } static void @@ -584,7 +629,7 @@ if (count != 1) return; - bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1); + acpi_reslist_add(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1); } static void @@ -599,7 +644,7 @@ if (count != 1) return; - bus_set_resource(dev, SYS_RES_DRQ, cp->ar_ndrq++, *drq, 1); + acpi_reslist_add(dev, SYS_RES_DRQ, cp->ar_ndrq++, *drq, 1); } static void From owner-p4-projects@FreeBSD.ORG Fri Aug 20 17:28:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BEF016A4D0; Fri, 20 Aug 2004 17:28:03 +0000 (GMT) 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 D8EAA16A4CE for ; Fri, 20 Aug 2004 17:28:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEBCA43D31 for ; Fri, 20 Aug 2004 17:28:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KHS2tf031684 for ; Fri, 20 Aug 2004 17:28:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KHS2hP031681 for perforce@freebsd.org; Fri, 20 Aug 2004 17:28:02 GMT (envelope-from jhb@freebsd.org) Date: Fri, 20 Aug 2004 17:28:02 GMT Message-Id: <200408201728.i7KHS2hP031681@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 60154 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: Fri, 20 Aug 2004 17:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=60154 Change 60154 by jhb@jhb_slimer on 2004/08/20 17:27:23 Yay for cpu_spinwait() and fewer ugly #ifdefs! Affected files ... .. //depot/projects/smpng/sys/kern/kern_shutdown.c#47 edit .. //depot/projects/smpng/sys/kern/subr_smp.c#34 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#47 (text+ko) ==== @@ -500,11 +500,8 @@ */ if (panic_thread != curthread) while (atomic_cmpset_ptr(&panic_thread, NULL, curthread) == 0) - while (panic_thread != NULL) { -#ifdef __i386__ - ia32_pause(); -#endif - } + while (panic_thread != NULL) + cpu_spinwait(); #endif bootopt = RB_AUTOBOOT | RB_DUMP; ==== //depot/projects/smpng/sys/kern/subr_smp.c#34 (text+ko) ==== @@ -229,9 +229,7 @@ i = 0; while ((stopped_cpus & map) != map) { /* spin */ -#ifdef __i386__ - ia32_pause(); -#endif + cpu_spinwait(); i++; #ifdef DIAGNOSTIC if (i == 100000) { @@ -271,12 +269,9 @@ atomic_store_rel_int(&started_cpus, map); /* wait for each to clear its bit */ - while ((stopped_cpus & map) != 0) { -#ifdef __i386__ - ia32_pause(); -#endif + while ((stopped_cpus & map) != 0) /* nothing */ - } + cpu_spinwait(); return 1; } From owner-p4-projects@FreeBSD.ORG Fri Aug 20 17:28:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E912216A4DA; Fri, 20 Aug 2004 17:28:04 +0000 (GMT) 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 326C716A4CE for ; Fri, 20 Aug 2004 17:28:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29CEE43D31 for ; Fri, 20 Aug 2004 17:28:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KHS38l031691 for ; Fri, 20 Aug 2004 17:28:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KHS2rq031687 for perforce@freebsd.org; Fri, 20 Aug 2004 17:28:02 GMT (envelope-from jhb@freebsd.org) Date: Fri, 20 Aug 2004 17:28:02 GMT Message-Id: <200408201728.i7KHS2rq031687@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 60155 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: Fri, 20 Aug 2004 17:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=60155 Change 60155 by jhb@jhb_slimer on 2004/08/20 17:28:00 Update todo. Affected files ... .. //depot/projects/smpng/sys/notes#17 edit Differences ... ==== //depot/projects/smpng/sys/notes#17 (text+ko) ==== @@ -3,9 +3,6 @@ - Consolidate linux module version and dependencies into MI location. - Untested -- Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead - of DEBUG. ?? -- Lock Giant at beginning of pcic(4) driver's kthread ?? - Use an explicit IDT handler for the PPro errata 5AP. - CVS already has a different work around where we disable the local APIC on these processors. However, the apic(4) code tries to re-enable the @@ -52,5 +49,10 @@ buys is being able to swi_sched() from a fast handler, but that doesn't make sense because you can't actually enqueue a task onto its queue from a fast interrupt context +- Make ABI wrappers use kern_fcntl() and make them MP safe. +- "Optimize" atomic_store_rel() on i386 (it actually seems to be slower, + go figure) +- Optimize spin locks on UP such that they don't do atomic operations + - Untested Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Fri Aug 20 23:07:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3DDF16A4D0; Fri, 20 Aug 2004 23:07:35 +0000 (GMT) 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 A20E016A4CE for ; Fri, 20 Aug 2004 23:07:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9386143D2F for ; Fri, 20 Aug 2004 23:07:35 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KN7ZXY044516 for ; Fri, 20 Aug 2004 23:07:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KN7ZC7044513 for perforce@freebsd.org; Fri, 20 Aug 2004 23:07:35 GMT (envelope-from marcel@freebsd.org) Date: Fri, 20 Aug 2004 23:07:35 GMT Message-Id: <200408202307.i7KN7ZC7044513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60166 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: Fri, 20 Aug 2004 23:07:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=60166 Change 60166 by marcel@marcel_nfs on 2004/08/20 23:06:50 Diff reduction ($FreeBSD$ fodder). Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#4 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#4 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#3 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.1 2004/07/25 05:29:15 marcel Exp $ PROG= kgdb SRCS= kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#4 (text+ko) ==== @@ -22,6 +22,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.1 2004/07/25 05:29:15 marcel Exp $ */ #ifndef _KGDB_H_ ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c,v 1.1 2004/07/25 05:29:15 marcel Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Fri Aug 20 23:09:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E501D16A4D0; Fri, 20 Aug 2004 23:09:38 +0000 (GMT) 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 8FA4316A4CE for ; Fri, 20 Aug 2004 23:09:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86E9A43D41 for ; Fri, 20 Aug 2004 23:09:38 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7KN9c4f044587 for ; Fri, 20 Aug 2004 23:09:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7KN9cha044584 for perforce@freebsd.org; Fri, 20 Aug 2004 23:09:38 GMT (envelope-from marcel@freebsd.org) Date: Fri, 20 Aug 2004 23:09:38 GMT Message-Id: <200408202309.i7KN9cha044584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 60167 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: Fri, 20 Aug 2004 23:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=60167 Change 60167 by marcel@marcel_nfs on 2004/08/20 23:08:50 Remove the first incarnation of kgdb(1), which used a seperate gdb(1) process. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#9 delete .. //depot/projects/gdb/usr.bin/kgdb/kgdb.1#2 delete .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#9 delete .. //depot/projects/gdb/usr.bin/kgdb/kthr.c#5 delete .. //depot/projects/gdb/usr.bin/kgdb/main.c#11 delete .. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#6 delete .. //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#6 delete .. //depot/projects/gdb/usr.bin/kgdb/packet.c#7 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 21 01:31:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C77A16A4D0; Sat, 21 Aug 2004 01:31:34 +0000 (GMT) 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 48CDD16A4CE for ; Sat, 21 Aug 2004 01:31:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2833143D41 for ; Sat, 21 Aug 2004 01:31:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7L1VYZO048425 for ; Sat, 21 Aug 2004 01:31:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7L1VXbN048422 for perforce@freebsd.org; Sat, 21 Aug 2004 01:31:33 GMT (envelope-from peter@freebsd.org) Date: Sat, 21 Aug 2004 01:31:33 GMT Message-Id: <200408210131.i7L1VXbN048422@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 60172 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: Sat, 21 Aug 2004 01:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=60172 Change 60172 by peter@peter_daintree on 2004/08/21 01:30:40 IFC @60171 Affected files ... .. //depot/projects/hammer/UPDATING#48 integrate .. //depot/projects/hammer/etc/rc.d/jail#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#27 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#17 integrate .. //depot/projects/hammer/lib/Makefile#39 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_setcurthread.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/hammer/release/Makefile#53 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#11 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#17 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#22 integrate .. //depot/projects/hammer/share/man/man4/aha.4#8 integrate .. //depot/projects/hammer/share/man/man4/hfa.4#2 integrate .. //depot/projects/hammer/share/man/man4/ipfirewall.4#4 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/hammer/share/man/man4/ncr.4#3 integrate .. //depot/projects/hammer/share/man/man4/rc.4#3 integrate .. //depot/projects/hammer/share/man/man4/sk.4#5 integrate .. //depot/projects/hammer/share/man/man4/sym.4#5 integrate .. //depot/projects/hammer/share/man/man4/umct.4#5 integrate .. //depot/projects/hammer/share/man/man4/umodem.4#3 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#11 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#23 integrate .. //depot/projects/hammer/share/man/man9/MUTEX_PROFILING.9#3 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#5 integrate .. //depot/projects/hammer/sys/Makefile#8 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#59 integrate .. //depot/projects/hammer/sys/conf/options#52 integrate .. //depot/projects/hammer/sys/conf/options.i386#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcreg.h#2 delete .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#45 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#20 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#50 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#61 integrate .. //depot/projects/hammer/sys/kern/subr_disk.c#11 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#6 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#9 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#37 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/hammer/sys/pci/agp_sis.c#12 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#14 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#29 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#7 integrate .. //depot/projects/hammer/sys/sys/bio.h#13 integrate .. //depot/projects/hammer/sys/sys/fdcio.h#2 integrate .. //depot/projects/hammer/sys/sys/proc.h#60 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#8 integrate .. //depot/projects/hammer/tools/tools/README#8 integrate .. //depot/projects/hammer/tools/tools/raidtest/Makefile#1 branch .. //depot/projects/hammer/tools/tools/raidtest/README#1 branch .. //depot/projects/hammer/tools/tools/raidtest/raidtest.c#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/default.rc#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_4.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_4.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_5.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#11 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#22 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#17 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/fdformat/fdformat.c#3 integrate .. //depot/projects/hammer/usr.sbin/fdread/fdutil.c#5 integrate Differences ... ==== //depot/projects/hammer/UPDATING#48 (text+ko) ==== @@ -21,6 +21,21 @@ developers choose to disable these features on build machines to maximize performance. +20040819: + Netgraph changed its message format slightly to align the data + portion well on 64 bit machines. + Netgraph using utilities (e.g. ngctl, nghook, ppp, mpd, + pppoed, bluetooth, ATM) should be recompiled when a new kernel + is installed. + +20040817: + IPFW has been converted to use PFIL_HOOKS. This change is + transparent to userland and preserves the ipfw ABI. The ipfw + core packet inspection and filtering functions have not been + changed, only how ipfw is invoked is different. Note that + "option PFIL_HOOKS" is required to use IPFIREWALL compiled + into the kernel or as KLD. + 20040814: The RANDOM_IP_ID option has been replaced by the sysctl net.inet.ip.random_id. If you had RANDOM_IP_ID in your kernel then @@ -1773,4 +1788,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.342 2004/08/14 16:16:01 dwmalone Exp $ +$FreeBSD: src/UPDATING,v 1.345 2004/08/20 01:24:23 julian Exp $ ==== //depot/projects/hammer/etc/rc.d/jail#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.15 2004/08/16 16:37:06 nectar Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.16 2004/08/19 08:55:24 des Exp $ # # PROVIDE: jail @@ -94,17 +94,17 @@ jail_umount_fs() { if checkyesno jail_fdescfs; then - if [ -d ${jail_fdescdir} ] ; then + if [ -d "${jail_fdescdir}" ] ; then umount -f ${jail_fdescdir} >/dev/null 2>&1 fi fi if checkyesno jail_devfs; then - if [ -d ${jail_devdir} ] ; then + if [ -d "${jail_devdir}" ] ; then umount -f ${jail_devdir} >/dev/null 2>&1 fi fi if checkyesno jail_procfs; then - if [ -d ${jail_procdir} ] ; then + if [ -d "${jail_procdir}" ] ; then umount -f ${jail_procdir} >/dev/null 2>&1 fi fi @@ -132,7 +132,7 @@ devfs_mount_jail "${jail_devdir}" ${jail_ruleset} # Transitional symlink for old binaries - if [ ! -L ${jail_devdir}/log ]; then + if [ ! -L "${jail_devdir}/log" ]; then __pwd="`pwd`" cd "${jail_devdir}" ln -sf ../var/run/log log @@ -153,7 +153,7 @@ fi if checkyesno jail_procfs; then info "Mounting procfs onto ${jail_procdir}" - if [ -d ${jail_procdir} ] ; then + if [ -d "${jail_procdir}" ] ; then mount -t procfs proc "${jail_procdir}" fi fi @@ -175,9 +175,9 @@ echo -n 'Stopping jails:' for _jail in ${jail_list} do - if [ -f /var/run/jail_${_jail}.id ]; then + if [ -f "/var/run/jail_${_jail}.id" ]; then _jail_id=$(cat /var/run/jail_${_jail}.id) - if [ ! -z ${_jail_id} ]; then + if [ ! -z "${_jail_id}" ]; then init_variables $_jail killall -j ${_jail_id} -TERM > /dev/null 2>&1 jail_umount_fs ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#27 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.141 2004/08/15 19:24:17 rwatson Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.142 2004/08/20 13:39:28 des Exp $ % -- Gifts for Children -- @@ -15991,6 +15991,9 @@ (5) Any computer with a mouse is worthless. -- Rich Kulawiec % +Women come and go, but BSD is forever. + -- Derek Young +% Wood is highly ecological, since trees are a renewable resource. If you cut down a tree, another will grow in its place. And if you cut down the new tree, still another will grow. And if you cut down that ==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.41 2004/04/16 07:19:13 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.42 2004/08/19 10:41:54 ru Exp $ .\" .\" %beginstrip% . @@ -57,10 +57,12 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~5.2 +.ds doc-default-operating-system FreeBSD\~6.0 . .\" FreeBSD releases not found in doc-common +.\" .ds doc-operating-system-FreeBSD-4.11 4.11 .\" .ds doc-operating-system-FreeBSD-5.4 5.4 +.\" .ds doc-operating-system-FreeBSD-6.0 6.0 . .ec . ==== //depot/projects/hammer/lib/Makefile#39 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.189 2004/08/09 11:30:36 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.190 2004/08/19 23:51:42 davidxu Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -97,8 +97,7 @@ _libpthread= libpthread .endif -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \ - !defined(NOLIBTHR) +.if ${MACHINE_ARCH} != "arm" && !defined(NOLIBTHR) _libthr= libthr .endif ==== //depot/projects/hammer/lib/libc/stdlib/malloc.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.61 2004/08/18 21:13:15 alfred Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.62 2004/08/19 16:34:31 alfred Exp $ .\" -.Dd August 27, 1996 +.Dd August 19, 2004 .Dt MALLOC 3 .Os .Sh NAME @@ -120,13 +120,12 @@ If memory can be allocated, the memory referenced by .Fa ptr is freed and a pointer to the newly allocated memory is returned. -Note that the return value may differ from the -.Fa ptr -argument, that is +Note that .Fn realloc and .Fn reallocf -may move the memory. +may move the memory allocation resulting in a different return value than +.Fa ptr . If .Fa ptr is ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#13 (text+ko) ==== @@ -23,7 +23,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/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.14 2004/08/15 16:21:30 dfr Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.15 2004/08/19 23:49:04 davidxu Exp $ */ #include @@ -47,13 +47,16 @@ struct tcb *tcb_self; /* required by rtld */ void *tcb_dtv; /* required by rtld */ struct pthread *tcb_thread; + int tcb_ldt; }; void _retire_thread(void *entry) { - _rtld_free_tls(entry, sizeof(struct tcb), 16); - /* XXX free ldt descriptor here */ + struct tcb *tcb = (struct tcb *)entry; + + i386_set_ldt(tcb->tcb_ldt, NULL, 1); + _rtld_free_tls(tcb, sizeof(struct tcb), 16); } void * @@ -66,6 +69,10 @@ *err = 0; + if (uc == NULL && thr->arch_id != NULL) { + return (thr->arch_id); + } + if (uc == NULL) { __asm __volatile("movl %%gs:0, %0" : "=r" (oldtls)); } else { @@ -104,7 +111,7 @@ ldt_index = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1); if (ldt_index == -1) abort(); - + tcb->tcb_ldt = ldt_index; /* * Set up our gs with the index into the ldt for this entry. */ ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.18 2004/07/04 19:07:07 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.19 2004/08/19 23:49:04 davidxu Exp $ */ #include #include @@ -99,9 +99,10 @@ /* Initialise the machine context: */ getcontext(&new_thread->ctx); + new_thread->savedsig = new_thread->ctx.uc_sigmask; new_thread->ctx.uc_stack.ss_sp = new_thread->stack; new_thread->ctx.uc_stack.ss_size = pattr->stacksize_attr; - makecontext(&new_thread->ctx, _thread_start, 0); + makecontext(&new_thread->ctx, (void (*)(void))_thread_start, 1, new_thread); new_thread->arch_id = _set_curthread(&new_thread->ctx, new_thread, &ret); if (ret != 0) { if (pattr->stackaddr_attr == NULL) { @@ -145,7 +146,11 @@ */ if (pattr->suspend == PTHREAD_CREATE_SUSPENDED) new_thread->flags |= PTHREAD_FLAGS_SUSPENDED; + /* new thread inherits signal mask in kernel */ + _thread_sigblock(); ret = thr_create(&new_thread->ctx, &new_thread->thr_id, flags); + /* restore my signal mask */ + _thread_sigunblock(); if (ret != 0) { _thread_printf(STDERR_FILENO, "thr_create() == %d\n", ret); PANIC("thr_create"); @@ -160,12 +165,24 @@ } void -_thread_start(void) +_thread_start(pthread_t td) { + int ret; + + /* + * for AMD64, we need to set fsbase by thread itself, before + * fsbase is set, we can not run any other code, for example + * signal code. + */ + _set_curthread(NULL, td, &ret); + + /* restore signal mask inherited before */ + __sys_sigprocmask(SIG_SETMASK, &td->savedsig, NULL); + if ((curthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) _thread_suspend(curthread, NULL); + pthread_exit(curthread->start_routine(curthread->arg)); - /* This point should never be reached. */ PANIC("Thread has resumed after exit"); } ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.39 2004/07/18 04:23:30 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.40 2004/08/19 23:49:04 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -797,7 +797,7 @@ void _thread_dump_info(void); void _thread_init(void); void _thread_printf(int fd, const char *, ...); -void _thread_start(void); +void _thread_start(pthread_t td); void _thread_seterrno(pthread_t, int); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); ==== //depot/projects/hammer/release/Makefile#53 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.854 2004/08/18 11:11:46 grehan Exp $ +# $FreeBSD: src/release/Makefile,v 1.855 2004/08/19 10:34:59 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -18,11 +18,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=5.2-RELEASE +#BUILDNAME=6.0-CURRENT # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 5.2 +BASE = 6.0 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -1074,7 +1074,8 @@ SRM V5.7-1). Adaptec 2930U2 and 2940U2[W] do not work. 164LX and 164SX with SRM firmware version 5.8 or later can boot - from Adaptec 2940-series adapters. + from Adaptec 2940-series adapters. A test with an Adaptec 3940UW + showed that that one is not supported however. In summary: this family of machines is blessed with a challenging compatibility as far as SCSI adapters go. @@ -1083,6 +1084,8 @@ (PC100 or PC133) 256MB DIMMs are reported to work just fine. Whether 512MB DIMMs will also work is currently unknown. You can use ECC or non-ECC DIMMs. The non-ECC ones are the same as commonly found in PCs. + Unfortunately the 164SX is quite picky on which DIMMs it likes, + so be prepared to test and experiment. PCI bridge chips are sometimes not appreciated by the 164SX, ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.227 2004/08/15 22:14:29 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.229 2004/08/19 22:03:20 simon Exp $ Supported Devices @@ -46,12 +46,10 @@ etc. can be found in the manual pages. - Lists of specific, supported devices are gradually being - removed from this document in order to reduce the amount of - duplicated (and potentially out-of-date) information contained - within. When this process is complete, the manual page for each - driver should be consulted for the authoritative list of devices - supported that particular driver. + The device lists in this document are being generated + automatically from &os; manual pages. This means that some + devices, which are supported by multiple drivers, may appear + multiple times. @@ -220,12 +218,9 @@ &hwlist.twa; - LSI/Symbios (formerly NCR) - 53C8XX and 53C10XX PCI - SCSI controllers, either embedded on motherboard or on add-on - boards (&man.ncr.4; and &man.sym.4; drivers) - - + &hwlist.ncr; + + &hwlist.sym; &hwlist.ncv; @@ -233,8 +228,6 @@ &hwlist.isp; - DTC 3290 EISA SCSI controller in 1542 emulation mode. - &hwlist.amd; &hwlist.nsp; @@ -1343,19 +1336,9 @@ - Modems (&man.umodem.4; driver) - - - 3Com 5605 - - - Metricom Ricochet GS USB wireless modem - - - Yamaha Broadband Wireless Router RTW65b - - - + + &hwlist.umodem; + Mice (&man.ums.4; driver) Printers and parallel printer conversion cables (&man.ulpt.4; driver) @@ -1390,8 +1373,9 @@ &man.ubser.4;, &man.uftdi.4;, and &man.uplcom.4; drivers) - Scanners (through SANE) (&man.uscanner.4; driver) - + + &hwlist.uscanner; + Storage (&man.umass.4; driver) ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.5 2004/08/15 22:14:29 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.6 2004/08/19 22:03:20 simon Exp $ # # @@ -66,16 +66,20 @@ mly i386,amd64 mpt i386,alpha,pc98,sparc64,ia64,amd64 my i386,pc98 +ncr i386,pc98,alpha,sparc64,amd64 ncv i386,pc98 nsp i386,pc98 ohci i386,pc98,alpha,ia64,amd64 rl i386,pc98,alpha,sparc64,amd64 stg i386,pc98 +sym i386,pc98,alpha,sparc64,amd64 trm i386,amd64 twa i386 twe i386 txp i386,pc98,alpha,amd64 udav i386,pc98,amd64 +umodem i386,pc98,amd64 +uscanner i386,pc98,amd64 vr i386,pc98,alpha,amd64 xe i386,amd64 xl i386,pc98,alpha,sparc64,amd64 ==== //depot/projects/hammer/sbin/fsck_ffs/setup.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.47 2004/04/09 19:58:28 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.48 2004/08/19 11:09:12 jhb Exp $"); #include #include @@ -306,7 +306,7 @@ super = bflag; if ((bread(fsreadfd, (char *)&sblock, super, (long)SBLOCKSIZE))) return (0); - if (sblock.fs_magic == FS_BAD2_MAGIC) { + if (sblock.fs_magic == FS_BAD_MAGIC) { fprintf(stderr, BAD_MAGIC_MSG); exit(11); } @@ -322,7 +322,7 @@ if ((bread(fsreadfd, (char *)&sblock, super, (long)SBLOCKSIZE))) return (0); - if (sblock.fs_magic == FS_BAD2_MAGIC) { + if (sblock.fs_magic == FS_BAD_MAGIC) { fprintf(stderr, BAD_MAGIC_MSG); exit(11); } ==== //depot/projects/hammer/sbin/newfs/mkfs.c#17 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.85 2004/04/09 19:58:33 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.86 2004/08/19 11:09:12 jhb Exp $"); #include #include @@ -236,8 +236,14 @@ } sblock.fs_fsbtodb = ilog2(sblock.fs_fsize / sectorsize); sblock.fs_size = fssize = dbtofsb(&sblock, fssize); + + /* + * Before the filesystem is finally initialized, mark it + * as incompletely initialized. + */ + sblock.fs_magic = FS_BAD_MAGIC; + if (Oflag == 1) { - sblock.fs_magic = FS_UFS1_MAGIC; sblock.fs_sblockloc = SBLOCK_UFS1; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs1_dinode); @@ -257,7 +263,6 @@ sblock.fs_old_postblformat = 1; sblock.fs_old_nrpos = 1; } else { - sblock.fs_magic = FS_BAD2_MAGIC; sblock.fs_sblockloc = SBLOCK_UFS2; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs2_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode); @@ -455,8 +460,8 @@ } if (Eflag == 2) printf("** Leaving BAD MAGIC on Eflag 2\n"); - else if (Oflag != 1) - sblock.fs_magic = FS_UFS2_MAGIC; + else + sblock.fs_magic = (Oflag != 1) ? FS_UFS2_MAGIC : FS_UFS1_MAGIC; /* * Now build the cylinders group blocks and ==== //depot/projects/hammer/share/examples/etc/make.conf#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.229 2004/08/15 20:32:06 marius Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.230 2004/08/19 09:54:28 des Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -106,6 +106,7 @@ #ENABLE_SUID_NEWGRP= true # # To avoid building various parts of the base system: +#NO_BOOT= true # do not build boot blocks and loader #NO_CVS= true # do not build CVS #NO_CXX= true # do not build C++ and friends #NO_BIND= true # do not build BIND ==== //depot/projects/hammer/share/man/man4/aha.4#8 (text+ko) ==== @@ -24,7 +24,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/share/man/man4/aha.4,v 1.24 2004/07/04 14:17:41 simon Exp $ +.\" $FreeBSD: src/share/man/man4/aha.4,v 1.25 2004/08/19 20:49:38 simon Exp $ .\" .Dd July 4, 2004 .Dt AHA 4 @@ -85,6 +85,8 @@ .It Adaptec AHA-174x in 154x emulation mode .It +DTC 3290 SCSI controller in 1542 emulation mode +.It Tekram SCSI controllers in 154x emulation mode .El .Sh BUGS ==== //depot/projects/hammer/share/man/man4/hfa.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.2 2004/08/06 16:08:43 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.3 2004/08/20 04:52:00 trhodes Exp $ .\" -.Dd August 06, 2004 +.Dd August 6, 2004 .Dt HFA 4 .Os .Sh NAME @@ -75,15 +75,17 @@ The following sysctls are recognized by the driver and may be used to enable or disable traffic shaping: .Bl -tag -width indent -.It Va hw.atm.hfaN.shape=0 -Disable shaping on card number N. -.It Va hw.atm.hfaN.shape=1 -Set one VCI to be traffic shaped on device N. +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 0 +Disable shaping on card number +.Ar N . +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 1 +Set one VCI to be traffic shaped on device +.Ar N . This will shape the first CBR VCI which is opened. -.It Va hw.atm.hfaN.shape=2 -Attempt to shape all VCIs on device N. +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 2 +Attempt to shape all VCIs on device +.Ar N . .El -.Pp The firmware should be loaded before using this driver, this can be an easy task if the .Xr fore_dnld 8 @@ -123,9 +125,10 @@ .Sh HISTORY The .Nm -driver -first appeared in -.Fx 3.0 . +driver was written by Network Computing Serices, Inc. +and added to +.Fx 3.0 by +.An Poul-Henning Kamp Aq phk@FreeBSD.org . This manual page first appeared in .Fx 5.3 . .Sh AUTHORS ==== //depot/projects/hammer/share/man/man4/ipfirewall.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.29 2002/11/29 11:39:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.30 2004/08/19 18:04:10 andre Exp $ .\" .Dd October 28, 2002 .Dt IPFW 4 @@ -46,6 +46,8 @@ enable .Xr divert 4 sockets +.It Dv PFIL_HOOKS +add packet filter hooks .El .Sh SEE ALSO .Xr setsockopt 2 , @@ -53,4 +55,5 @@ .Xr ip 4 , .Xr ipfw 8 , .Xr sysctl 8 , -.Xr syslogd 8 +.Xr syslogd 8 , +.Xr pfil 9 ==== //depot/projects/hammer/share/man/man4/ixgb.4#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.2 2004/07/08 07:27:26 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.3 2004/08/19 14:33:53 brueffer Exp $ .\" -.Dd March 1, 2004 +.Dd August 19, 2004 .Dt IXGB 4 .Os .Sh NAME @@ -64,6 +64,17 @@ This driver version supports VLANs. For information on enabling VLANs, see the .Pa README . +.Sh HARDWARE +Adapters supported by the +.Nm +driver include: +.Pp +.Bl -bullet -compact +.It +Intel PRO/10GbE LR Server Adapter +.It +Intel PRO/10GbE SR Server Adapter +.El .Sh DIAGNOSTICS .Bl -diag .It "ixgb%d: Unable to allocate bus resource: memory" ==== //depot/projects/hammer/share/man/man4/man4.i386/snc.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.1 2004/07/24 20:41:45 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.2 2004/08/20 05:07:02 trhodes Exp $ .\" -.Dd July 24, 2004 +.Dd August 20, 2004 .Dt SNC 4 i386 .Os .Sh NAME @@ -95,23 +95,17 @@ .Tn PnP buses. Support is also provided for legacy C-Bus. -.Sh ERRORS +.Sh DIAGNOSTICS The following driver specific error messages may be reported: -.Bl -tag -width Er -.It Bq Er EIO -May be returned if the device cannot allocate a port, -memory resource, or +.Bl -diag +.It "snc%d: snc_nec16_register_irq: unsupported irq (%d)" +The card returned an .Tn IRQ -with the given resource ID. -.It Bq Er ENOENT -May be returned if the driver cannot assign memory, a port or an -.Tn IRQ -to the board. -.It Bq Er ENXIO -May be returned if the card supplied a -.Tn PnP -ID which did not match any of the known IDs. +which is not supported by the driver. +.It "snc%d: invalid packet length %d bytes" +An attempt to transfer a data packet failed due to an +invalid packet length. .El .Sh SEE ALSO .Xr card 4 , ==== //depot/projects/hammer/share/man/man4/ncr.4#3 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (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/share/man/man4/ncr.4,v 1.14 2003/11/09 22:21:21 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ncr.4,v 1.15 2004/08/19 21:24:45 simon Exp $ .\" -.Dd November 9, 2003 +.Dd August 19, 2004 .Dt NCR 4 .Os .Sh NAME @@ -31,7 +31,7 @@ .Nd NCR 53C8xx SCSI driver .Sh SYNOPSIS .Cd "device ncr" -.Sh DESCRIPTION +.Sh HARDWARE The .Nm driver provides support for the following NCR/Symbios SCSI controller ==== //depot/projects/hammer/share/man/man4/rc.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/rc.4,v 1.2 2004/07/08 06:38:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/rc.4,v 1.3 2004/08/20 05:25:11 trhodes Exp $ .\" -.Dd June 21, 2004 +.Dd August 20, 2004 .Dt RC 4 .Os .Sh NAME @@ -62,30 +62,30 @@ file. .Pp This driver is mostly based on Cirrus Logic CL-CD180 driver. -.Sh ERRORS +.Sh DIAGNOSTICS The following driver specific error messages may be reported: -.Bl -tag -width Er -.It Bq Er EBUSY -May be returned if the device was busy when a -request to access its resources was made by +.Bl -diag +.It "rc%d channel%d: interrupt-level buffer overflow" +An internal buffer overflow error has occurred on +the listed channel. +The .Nm -and was denied. -.It Bq Er ENOMEM -May be returned if the +driver will need reloaded to correct this. +.It "rc%d: Bad char chan %d" +The channel has obtained a bad set of characters. +.It "rc%d: Got extra chars chan %d" +The .Nm -driver was unable to obtain the -.Tn IOBASE -addresses. -.It Bq Er ENXIO -May be returned if the device cannot obtain a valid -.Tn I/O -port through -.Fn isa_get_port . -This error may also be returned if the -.Fn isa_get_irq -function cannot obtain a valid -.Tn IRQ . +driver got more characters than expected on the channel shown. +.It "rc%d: data mismatch chan %d ptr %d (%d != %d)" +Data sent from channel +.Ar %d +to the rx buffer was different then expected. +.It "rc%d: channel %d command timeout, rc.c line: %d" +A command timeout has occurred on the channel, the +.Pa src/sys/dev/rc.c +file can be consulted for more information. .El .Sh SEE ALSO .Xr tty 1 , ==== //depot/projects/hammer/share/man/man4/sk.4#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sk.4,v 1.21 2004/01/09 17:43:37 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/sk.4,v 1.22 2004/08/20 06:27:58 jmg Exp $ .\" -.Dd July 3, 1999 +.Dd August 19, 2004 .Dt SK 4 .Os .Sh NAME @@ -49,6 +49,8 @@ .It 3COM 3C940 single port, 1000baseT adapter .It +Belkin F5D5005 single port, 10000baseT adapter +.It Linksys EG1032 single port, 1000baseT adapter .It SK-9521 SK-NET GE-T single port, 1000baseT adapter ==== //depot/projects/hammer/share/man/man4/sym.4#5 (text+ko) ==== @@ -54,9 +54,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 21 10:35:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83C8B16A4D0; Sat, 21 Aug 2004 10:35:34 +0000 (GMT) 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 5A27C16A4CE for ; Sat, 21 Aug 2004 10:35:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D4E243D2D for ; Sat, 21 Aug 2004 10:35:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7LAZY1P065771 for ; Sat, 21 Aug 2004 10:35:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7LAZXvA065768 for perforce@freebsd.org; Sat, 21 Aug 2004 10:35:33 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 21 Aug 2004 10:35:33 GMT Message-Id: <200408211035.i7LAZXvA065768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60189 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: Sat, 21 Aug 2004 10:35:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=60189 Change 60189 by davidxu@davidxu_alona on 2004/08/21 10:34:57 Add code to support .core for threaded program. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#21 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#21 (text+ko) ==== @@ -27,6 +27,8 @@ #include "thread_db.h" #include "bfd.h" +#include "elf-bfd.h" +#include "gdbcore.h" #include "gdbthread.h" #include "inferior.h" #include "symfile.h" @@ -51,7 +53,12 @@ extern struct target_ops child_ops; /* This module's target vector. */ -static struct target_ops thread_db_ops; +static struct target_ops fbsd_thread_ops; +static struct target_ops fbsd_core_ops; + +/* Saved copy of orignal core_ops */ +static struct target_ops orig_core_ops; +extern struct target_ops core_ops; /* Pointer to the next function on the objfile event chain. */ static void (*target_new_objfile_chain) (struct objfile *objfile); @@ -60,7 +67,9 @@ static int fbsd_thread_present; /* Non-zero if we're using this module's target vector. */ -static int using_thread_db; +static int fbsd_thread_active; + +static int fbsd_thread_core = 0; /* Non-zero if we have to keep this module's target vector active across re-runs. */ @@ -123,7 +132,6 @@ /* Prototypes for local functions. */ static void fbsd_thread_find_new_threads (void); static int fbsd_thread_alive (ptid_t ptid); -static void fbsd_thread_activate(void); /* Building process ids. */ @@ -227,7 +235,7 @@ gdb_assert (IS_LWP (ptid)); - if (using_thread_db) + if (fbsd_thread_active) { err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); if (err == TD_OK) @@ -243,11 +251,30 @@ return BUILD_LWP (GET_LWP (ptid), GET_PID (ptid)); } +static void +fbsd_core_get_first_lwp (bfd *abfd, asection *asect, void *obj) +{ + if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0) + return; + + if (*(lwpid_t *)obj != 0) + return; + + *(lwpid_t *)obj = atoi (bfd_section_name (abfd, asect) + 5); +} + static long get_current_lwp (int pid) { struct ptrace_lwpinfo pl; + lwpid_t lwpid; + if (!target_has_execution) + { + lwpid = 0; + bfd_map_over_sections (core_bfd, fbsd_core_get_first_lwp, &lwpid); + return lwpid; + } if (ptrace (PT_LWPINFO, pid, (caddr_t)&pl, sizeof(pl))) perror_with_name("PT_LWPINFO"); @@ -271,6 +298,27 @@ } static void +fbsd_thread_activate (void) +{ + fbsd_thread_active = 1; + init_thread_list(); + fbsd_thread_find_new_threads (); + get_current_thread (); +} + +static void +fbsd_thread_deactivate (void) +{ + td_ta_delete_p (thread_agent); + + inferior_ptid = pid_to_ptid (proc_handle.pid); + proc_handle.pid = 0; + fbsd_thread_active = 0; + fbsd_thread_present = 0; + init_thread_list (); +} + +static void fbsd_thread_new_objfile (struct objfile *objfile) { td_err_e err; @@ -281,10 +329,10 @@ { /* All symbols have been discarded. If the thread_db target is active, deactivate it now. */ - if (using_thread_db) + if (fbsd_thread_active) { gdb_assert (proc_handle.pid == 0); - using_thread_db = 0; + fbsd_thread_active = 0; } goto quit; @@ -293,7 +341,7 @@ if (!child_suppress_run) goto quit; - if (using_thread_db) + if (fbsd_thread_active) /* Nothing to do. The thread library was already detected and the target vector was already activated. */ goto quit; @@ -318,16 +366,15 @@ /* We can only poke around if there actually is a child process. If there is no child process alive, postpone the steps below until one has been created. */ - if (proc_handle.pid != 0) + if (fbsd_thread_core == 0 && proc_handle.pid != 0) { - push_target(&thread_db_ops); + push_target(&fbsd_thread_ops); fbsd_thread_activate(); } else { td_ta_delete_p(thread_agent); thread_agent = NULL; - printf_filtered("%s postpone processing\n", __func__); } break; @@ -345,23 +392,41 @@ static void fbsd_thread_attach (char *args, int from_tty) { + fbsd_thread_core = 0; + child_ops.to_attach (args, from_tty); - /* Destroy thread info; it's no longer valid. */ - init_thread_list (); + /* Must get symbols from solibs before libthread_db can run! */ + SOLIB_ADD ((char *) 0, from_tty, (struct target_ops *) 0, auto_solib_add); + + if (fbsd_thread_present && !fbsd_thread_active) + push_target(&fbsd_thread_ops); +} - /* The child process is now the actual multi-threaded - program. Snatch its process ID... */ - proc_handle.pid = GET_PID (inferior_ptid); +static void +fbsd_thread_post_attach (int pid) +{ + child_ops.to_post_attach (pid); - /* ...and perform the remaining initialization steps. */ - fbsd_thread_find_new_threads(); - get_current_thread (); + if (fbsd_thread_present && !fbsd_thread_active) + { + proc_handle.pid = GET_PID (inferior_ptid); + fbsd_thread_activate (); + } } static void fbsd_thread_detach (char *args, int from_tty) { + fbsd_thread_deactivate (); + unpush_target (&fbsd_thread_ops); + + /* Clear gdb solib information and symbol file + cache, so that after detach and re-attach, new_objfile + hook will be called */ + + clear_solib(); + symbol_file_clear(0); proc_handle.pid = 0; child_ops.to_detach (args, from_tty); } @@ -401,7 +466,7 @@ GET_THREAD(inferior_ptid)); #endif - if (!using_thread_db) + if (!fbsd_thread_active) { child_ops.to_resume (ptid, step, signo); return; @@ -523,17 +588,32 @@ fbsd_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { - return child_ops.to_xfer_memory (memaddr, myaddr, len, write, - attrib, target); + int err; + + if (target_has_execution) + err = child_ops.to_xfer_memory (memaddr, myaddr, len, write, attrib, + target); + else + err = orig_core_ops.to_xfer_memory (memaddr, myaddr, len, write, attrib, + target); + + return (err); } static void fbsd_lwp_fetch_registers (int regno) { + struct cleanup *old_chain; gregset_t gregs; fpregset_t fpregs; lwpid_t lwp; + if (!target_has_execution) + { + orig_core_ops.to_fetch_registers (-1); + return; + } + lwp = GET_LWP (inferior_ptid); if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1) @@ -679,19 +759,10 @@ } static void -fbsd_thread_activate (void) -{ - using_thread_db = 1; - init_thread_list(); - fbsd_thread_find_new_threads (); - get_current_thread (); -} - -static void fbsd_thread_create_inferior (char *exec_file, char *allargs, char **env) { - if (fbsd_thread_present && !using_thread_db) - push_target(&thread_db_ops); + if (fbsd_thread_present && !fbsd_thread_active) + push_target(&fbsd_thread_ops); child_ops.to_create_inferior (exec_file, allargs, env); } @@ -699,7 +770,7 @@ static void fbsd_thread_post_startup_inferior (ptid_t ptid) { - if (fbsd_thread_present && !using_thread_db) + if (fbsd_thread_present && !fbsd_thread_active) { /* * The child process is now the actual multi-threaded @@ -723,6 +794,23 @@ child_ops.to_mourn_inferior (); } +static void +fbsd_core_check_lwp (bfd *abfd, asection *asect, void *obj) +{ + lwpid_t lwp; + + if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0) + return; + + /* already found */ + if (*(lwpid_t *)obj == 0) + return; + + lwp = atoi (bfd_section_name (abfd, asect) + 5); + if (*(lwpid_t *)obj == lwp) + *(lwpid_t *)obj = 0; +} + static int fbsd_thread_alive (ptid_t ptid) { @@ -730,6 +818,7 @@ td_thrinfo_t ti; td_err_e err; gregset_t gregs; + lwpid_t lwp; if (IS_THREAD (ptid)) { @@ -753,7 +842,7 @@ return 1; } - if (using_thread_db) + if (fbsd_thread_active) { err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); @@ -765,10 +854,23 @@ return 0; } + if (!target_has_execution) + { + lwp = GET_LWP (ptid); + bfd_map_over_sections (core_bfd, fbsd_core_check_lwp, &lwp); + return (lwp == 0); + } + /* check lwp in kernel */ return ptrace (PT_GETREGS, GET_LWP (ptid), (caddr_t)&gregs, 0) == 0; } +static void +fbsd_thread_files_info (struct target_ops *ignore) +{ + child_ops.to_files_info (ignore); +} + static int find_new_threads_callback (const td_thrhandle_t *th_p, void *data) { @@ -784,11 +886,10 @@ if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE) return 0; - ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); + ptid = BUILD_THREAD (ti.ti_tid, proc_handle.pid); if (!in_thread_list (ptid)) add_thread (ptid); - return 0; } @@ -797,7 +898,7 @@ { td_err_e err; - if (!using_thread_db) + if (!fbsd_thread_active) return; /* Iterate over all user-space threads to discover new threads. */ @@ -922,42 +1023,136 @@ static void fbsd_thread_tsd_cmd (char *exp, int from_tty) { - if (using_thread_db) + if (fbsd_thread_active) td_ta_tsd_iter_p (thread_agent, tsd_cb, NULL); } +static int +ignore (CORE_ADDR addr, char *contents) +{ + return 0; +} + +static void +fbsd_core_open (char *filename, int from_tty) +{ + int err; + + fbsd_thread_core = 1; + + orig_core_ops.to_open (filename, from_tty); + + if (fbsd_thread_present) + { + err = td_ta_new_p (&proc_handle, &thread_agent); + if (err == TD_OK) + { + proc_handle.pid = elf_tdata (core_bfd)->core_pid; + fbsd_thread_activate (); + } + else + error ("fbsd_core_open: td_open: %s", thread_db_err_str (err)); + } +} + +static void +fbsd_core_close (int quitting) +{ + orig_core_ops.to_close (quitting); +} + +static void +fbsd_core_detach (char *args, int from_tty) +{ + if (fbsd_thread_active) + fbsd_thread_deactivate (); + unpush_target (&fbsd_thread_ops); + orig_core_ops.to_detach (args, from_tty); + + /* Clear gdb solib information and symbol file + cache, so that after detach and re-attach, new_objfile + hook will be called */ + clear_solib(); + symbol_file_clear(0); +} + +static void +fbsd_core_files_info (struct target_ops *ignore) +{ + orig_core_ops.to_files_info (ignore); +} + +static void +init_fbsd_core_ops (void) +{ + fbsd_core_ops.to_shortname = "FreeBSD-core"; + fbsd_core_ops.to_longname = "FreeBSD core thread."; + fbsd_core_ops.to_doc = "FreeBSD thread support for core files."; + fbsd_core_ops.to_open = fbsd_core_open; + fbsd_core_ops.to_close = fbsd_core_close; + fbsd_core_ops.to_attach = 0; + fbsd_core_ops.to_post_attach = 0; + fbsd_core_ops.to_detach = fbsd_core_detach; + /* fbsd_core_ops.to_resume = 0; */ + /* fbsd_core_ops.to_wait = 0; */ + fbsd_core_ops.to_fetch_registers = fbsd_thread_fetch_registers; + /* fbsd_core_ops.to_store_registers = 0; */ + /* fbsd_core_ops.to_prepare_to_store = 0; */ + fbsd_core_ops.to_xfer_memory = fbsd_thread_xfer_memory; + fbsd_core_ops.to_files_info = fbsd_core_files_info; + fbsd_core_ops.to_insert_breakpoint = ignore; + fbsd_core_ops.to_remove_breakpoint = ignore; + /* fbsd_core_ops.to_lookup_symbol = 0; */ + fbsd_core_ops.to_create_inferior = fbsd_thread_create_inferior; + fbsd_core_ops.to_stratum = core_stratum; + fbsd_core_ops.to_has_all_memory = 0; + fbsd_core_ops.to_has_memory = 1; + fbsd_core_ops.to_has_stack = 1; + fbsd_core_ops.to_has_registers = 1; + fbsd_core_ops.to_has_execution = 0; + fbsd_core_ops.to_has_thread_control = tc_none; + fbsd_core_ops.to_thread_alive = fbsd_thread_alive; + fbsd_core_ops.to_pid_to_str = fbsd_thread_pid_to_str; + fbsd_core_ops.to_find_new_threads = fbsd_thread_find_new_threads; + fbsd_core_ops.to_sections = 0; + fbsd_core_ops.to_sections_end = 0; + fbsd_core_ops.to_magic = OPS_MAGIC; +} + static void -init_thread_db_ops (void) +init_fbsd_thread_ops (void) { - thread_db_ops.to_shortname = "multi-thread"; - thread_db_ops.to_longname = "multi-threaded child process."; - thread_db_ops.to_doc = "Threads and pthreads support."; - thread_db_ops.to_attach = fbsd_thread_attach; - thread_db_ops.to_detach = fbsd_thread_detach; - thread_db_ops.to_resume = fbsd_thread_resume; - thread_db_ops.to_wait = fbsd_thread_wait; - thread_db_ops.to_fetch_registers = fbsd_thread_fetch_registers; - thread_db_ops.to_store_registers = fbsd_thread_store_registers; - thread_db_ops.to_xfer_memory = fbsd_thread_xfer_memory; - thread_db_ops.to_kill = fbsd_thread_kill; - thread_db_ops.to_create_inferior = fbsd_thread_create_inferior; - thread_db_ops.to_post_startup_inferior = fbsd_thread_post_startup_inferior; - thread_db_ops.to_mourn_inferior = fbsd_thread_mourn_inferior; - thread_db_ops.to_can_run = fbsd_thread_can_run; - thread_db_ops.to_thread_alive = fbsd_thread_alive; - thread_db_ops.to_find_new_threads = fbsd_thread_find_new_threads; - thread_db_ops.to_pid_to_str = fbsd_thread_pid_to_str; - thread_db_ops.to_stratum = thread_stratum; - thread_db_ops.to_has_thread_control = tc_none; - thread_db_ops.to_has_all_memory = 1; - thread_db_ops.to_has_memory = 1; - thread_db_ops.to_has_stack = 1; - thread_db_ops.to_has_registers = 1; - thread_db_ops.to_has_execution = 1; - thread_db_ops.to_insert_breakpoint = memory_insert_breakpoint; - thread_db_ops.to_remove_breakpoint = memory_remove_breakpoint; - thread_db_ops.to_get_thread_local_address = fbsd_thread_get_local_address; - thread_db_ops.to_magic = OPS_MAGIC; + fbsd_thread_ops.to_shortname = "freebsd-threads"; + fbsd_thread_ops.to_longname = "FreeBSD multithreaded child process."; + fbsd_thread_ops.to_doc = "FreeBSD threads support."; + fbsd_thread_ops.to_attach = fbsd_thread_attach; + fbsd_thread_ops.to_detach = fbsd_thread_detach; + fbsd_thread_ops.to_post_attach = fbsd_thread_post_attach; + fbsd_thread_ops.to_resume = fbsd_thread_resume; + fbsd_thread_ops.to_wait = fbsd_thread_wait; + fbsd_thread_ops.to_fetch_registers = fbsd_thread_fetch_registers; + fbsd_thread_ops.to_store_registers = fbsd_thread_store_registers; + fbsd_thread_ops.to_xfer_memory = fbsd_thread_xfer_memory; + fbsd_thread_ops.to_files_info = fbsd_thread_files_info; + fbsd_thread_ops.to_kill = fbsd_thread_kill; + fbsd_thread_ops.to_create_inferior = fbsd_thread_create_inferior; + fbsd_thread_ops.to_post_startup_inferior = fbsd_thread_post_startup_inferior; + fbsd_thread_ops.to_mourn_inferior = fbsd_thread_mourn_inferior; + fbsd_thread_ops.to_can_run = fbsd_thread_can_run; + fbsd_thread_ops.to_thread_alive = fbsd_thread_alive; + fbsd_thread_ops.to_find_new_threads = fbsd_thread_find_new_threads; + fbsd_thread_ops.to_pid_to_str = fbsd_thread_pid_to_str; + fbsd_thread_ops.to_stratum = thread_stratum; + fbsd_thread_ops.to_has_thread_control = tc_none; + fbsd_thread_ops.to_has_all_memory = 1; + fbsd_thread_ops.to_has_memory = 1; + fbsd_thread_ops.to_has_stack = 1; + fbsd_thread_ops.to_has_registers = 1; + fbsd_thread_ops.to_has_execution = 1; + fbsd_thread_ops.to_insert_breakpoint = memory_insert_breakpoint; + fbsd_thread_ops.to_remove_breakpoint = memory_remove_breakpoint; + fbsd_thread_ops.to_get_thread_local_address = fbsd_thread_get_local_address; + fbsd_thread_ops.to_magic = OPS_MAGIC; } static int @@ -1047,14 +1242,22 @@ return 1; } +/* we suppress the call to add_target of core_ops in corelow because + if there are two targets in the stratum core_stratum, find_core_target + won't know which one to return. see corelow.c for an additonal + comment on coreops_suppress_target. */ + +int coreops_suppress_target = 1; + void _initialize_thread_db (void) { - /* Only initialize the module if we can load libthread_db. */ + init_fbsd_thread_ops (); + init_fbsd_core_ops (); + if (thread_db_load ()) { - init_thread_db_ops (); - add_target (&thread_db_ops); + add_target (&fbsd_thread_ops); /* "thread tsd" command */ add_cmd ("tsd", class_run, fbsd_thread_tsd_cmd, @@ -1062,15 +1265,24 @@ "for the process.\n", &thread_cmd_list); + memcpy (&orig_core_ops, &core_ops, sizeof (struct target_ops)); + memcpy (&core_ops, &fbsd_core_ops, sizeof (struct target_ops)); + add_target (&core_ops); + /* Add ourselves to objfile event chain. */ target_new_objfile_chain = target_new_objfile_hook; target_new_objfile_hook = fbsd_thread_new_objfile; + + child_suppress_run = 1; } else { - printf_filtered("%s: can not load %s.\n", __func__, LIBTHREAD_DB_SO); + fprintf_unfiltered (gdb_stderr, + "[GDB will not be able to debug user-mode threads: %s]\n", dlerror()); + + /* allow the user to debug non-threaded core files */ + add_target (&core_ops); } - child_suppress_run = 1; } /* proc service functions */ From owner-p4-projects@FreeBSD.ORG Sat Aug 21 11:21:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7794F16A4D0; Sat, 21 Aug 2004 11:21:30 +0000 (GMT) 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 540BE16A4CE for ; Sat, 21 Aug 2004 11:21:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 356D743D2D for ; Sat, 21 Aug 2004 11:21:30 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7LBLUpw067872 for ; Sat, 21 Aug 2004 11:21:30 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7LBLTgJ067869 for perforce@freebsd.org; Sat, 21 Aug 2004 11:21:29 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 21 Aug 2004 11:21:29 GMT Message-Id: <200408211121.i7LBLTgJ067869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60191 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: Sat, 21 Aug 2004 11:21:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=60191 Change 60191 by davidxu@davidxu_alona on 2004/08/21 11:20:46 Remove unused local variable. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#22 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#22 (text+ko) ==== @@ -603,7 +603,6 @@ static void fbsd_lwp_fetch_registers (int regno) { - struct cleanup *old_chain; gregset_t gregs; fpregset_t fpregs; lwpid_t lwp; From owner-p4-projects@FreeBSD.ORG Sat Aug 21 11:34:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 392C816A4D0; Sat, 21 Aug 2004 11:34:47 +0000 (GMT) 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 E982816A4CE for ; Sat, 21 Aug 2004 11:34:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9F1E43D48 for ; Sat, 21 Aug 2004 11:34:46 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7LBYkFi068361 for ; Sat, 21 Aug 2004 11:34:46 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7LBYkPd068358 for perforce@freebsd.org; Sat, 21 Aug 2004 11:34:46 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 21 Aug 2004 11:34:46 GMT Message-Id: <200408211134.i7LBYkPd068358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60192 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: Sat, 21 Aug 2004 11:34:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=60192 Change 60192 by davidxu@davidxu_alona on 2004/08/21 11:34:13 Clear status in fbsd_therad_mourn_inferior(). Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#23 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#23 (text+ko) ==== @@ -788,7 +788,10 @@ * Forget about the child's process ID. We shouldn't need it * anymore. */ - proc_handle.pid = 0; + if (fbsd_thread_active) + fbsd_thread_deactivate (); + + unpush_target (&fbsd_thread_ops); child_ops.to_mourn_inferior (); } From owner-p4-projects@FreeBSD.ORG Sat Aug 21 12:02:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B1F316A4D0; Sat, 21 Aug 2004 12:02:20 +0000 (GMT) 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 3D94616A4CE for ; Sat, 21 Aug 2004 12:02:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36C9843D31 for ; Sat, 21 Aug 2004 12:02:20 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7LC2Kgn069905 for ; Sat, 21 Aug 2004 12:02:20 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7LC2JxZ069902 for perforce@freebsd.org; Sat, 21 Aug 2004 12:02:19 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 21 Aug 2004 12:02:19 GMT Message-Id: <200408211202.i7LC2JxZ069902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60193 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: Sat, 21 Aug 2004 12:02:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=60193 Change 60193 by davidxu@davidxu_alona on 2004/08/21 12:02:19 Move freebsd headers to same place. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#24 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#24 (text+ko) ==== @@ -22,7 +22,6 @@ #include "defs.h" #include "gdb_assert.h" -#include #include "proc_service.h" #include "thread_db.h" @@ -39,6 +38,7 @@ #include "gdbcmd.h" #include "solib-svr4.h" +#include #include #define LIBTHREAD_DB_SO "libthread_db.so" From owner-p4-projects@FreeBSD.ORG Sat Aug 21 12:11:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2497D16A4D0; Sat, 21 Aug 2004 12:11:02 +0000 (GMT) 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 C455D16A4CE for ; Sat, 21 Aug 2004 12:11:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBFA843D48 for ; Sat, 21 Aug 2004 12:11:01 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7LCB1fm073174 for ; Sat, 21 Aug 2004 12:11:01 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7LCB1Ks073168 for perforce@freebsd.org; Sat, 21 Aug 2004 12:11:01 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 21 Aug 2004 12:11:01 GMT Message-Id: <200408211211.i7LCB1Ks073168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 60194 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: Sat, 21 Aug 2004 12:11:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=60194 Change 60194 by davidxu@davidxu_alona on 2004/08/21 12:11:01 report error to gdb_stderr device. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#25 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#25 (text+ko) ==== @@ -436,7 +436,7 @@ { int err = td_thr_dbsuspend_p (th_p); if (err != 0) - printf_filtered("%s %s\n", __func__, thread_db_err_str (err)); + fprintf_filtered(gdb_stderr, "%s %s\n", __func__, thread_db_err_str (err)); return (err); } @@ -445,7 +445,7 @@ { int err = td_thr_dbresume_p (th_p); if (err != 0) - printf_filtered("%s %s\n", __func__, thread_db_err_str (err)); + fprintf_filtered(gdb_stderr, "%s %s\n", __func__, thread_db_err_str (err)); return (err); }