From owner-p4-projects@FreeBSD.ORG Sun Feb 29 09:05:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23B1216A4D0; Sun, 29 Feb 2004 09:05:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE22916A4CE for ; Sun, 29 Feb 2004 09:05:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E71EB43D1D for ; Sun, 29 Feb 2004 09:05:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1TH5KGe057330 for ; Sun, 29 Feb 2004 09:05:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1TH5K1J057326 for perforce@freebsd.org; Sun, 29 Feb 2004 09:05:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Feb 2004 09:05:20 -0800 (PST) Message-Id: <200402291705.i1TH5K1J057326@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 47866 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, 29 Feb 2004 17:05:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=47866 Change 47866 by rwatson@rwatson_tislabs on 2004/02/29 09:05:08 Omitted in a previous commit (?) break out mac_net.c into mac_net.c, mac_socket.c, and mac_inet.c. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#102 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#102 (text+ko) ==== @@ -1616,11 +1616,13 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_posix_sem.c optional mac security/mac/mac_process.c optional mac +security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac security/mac/mac_sysv_msg.c optional mac security/mac/mac_sysv_sem.c optional mac From owner-p4-projects@FreeBSD.ORG Sun Feb 29 12:25:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 339FA16A4D0; Sun, 29 Feb 2004 12:25:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB10C16A4CE for ; Sun, 29 Feb 2004 12:25:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0DEC43D1F for ; Sun, 29 Feb 2004 12:25:25 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1TKPPGe000715 for ; Sun, 29 Feb 2004 12:25:25 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1TKPOEG000712 for perforce@freebsd.org; Sun, 29 Feb 2004 12:25:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Feb 2004 12:25:24 -0800 (PST) Message-Id: <200402292025.i1TKPOEG000712@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 47871 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, 29 Feb 2004 20:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=47871 Change 47871 by rwatson@rwatson_tislabs on 2004/02/29 12:24:51 Integrate netperf_socket: - Loop back BPF locking tweaks - Loop back soalloc() argument change Also merge ACPI code drop, watchdog changes, midway build fix, md sector size change, pf fixes, ata for ppc fixes. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES.fixed#1 branch .. //depot/projects/netperf_socket/sys/conf/NOTES#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#3 integrate .. //depot/projects/netperf_socket/sys/conf/options#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/en/midway.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/watchdog/watchdog.c#1 branch .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/geode.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/p4tcc.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#4 integrate .. //depot/projects/netperf_socket/sys/net/bpfdesc.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/kernel.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/time.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/watchdog.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1200 2004/02/28 00:12:46 sanpei Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1201 2004/02/28 20:56:34 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2089,11 +2089,9 @@ options HW_WDOG # -# Add software watchdog routines. This will add some sysctl OIDs that -# can be used in combination with an external daemon to create a -# software-based watchdog solution. +# Add software watchdog routines. # -options WATCHDOG +options SW_WATCHDOG # # Disable swapping of upages and stack pages. This option removes all ==== //depot/projects/netperf_socket/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.867 2004/02/28 00:12:47 sanpei Exp $ +# $FreeBSD: src/sys/conf/files,v 1.869 2004/02/28 23:04:45 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,7 +189,7 @@ contrib/dev/acpica/utcopy.c optional acpi contrib/dev/acpica/utdebug.c optional acpi contrib/dev/acpica/utdelete.c optional acpi -contrib/dev/acpica/uteval.c optional acpi +contrib/dev/acpica/uteval.c optional acpi nowerror contrib/dev/acpica/utglobal.c optional acpi nowerror contrib/dev/acpica/utinit.c optional acpi contrib/dev/acpica/utmath.c optional acpi @@ -868,6 +868,7 @@ dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci #dev/wlp/if_wlp.c optional wlp card +dev/watchdog/watchdog.c standard dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi dev/wi/if_wi_pccard.c optional wi pccard ==== //depot/projects/netperf_socket/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.432 2004/02/26 03:53:52 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.433 2004/02/28 20:56:35 phk Exp $ # # On the handling of kernel options # @@ -153,9 +153,9 @@ SYSVMSG opt_sysvipc.h SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h +SW_WATCHDOG opt_watchdog.h TTYHOG opt_tty.h VFS_AIO -WATCHDOG opt_watchdog.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#2 (text+ko) ==== @@ -1,4 +1,369 @@ ---------------------------------------- +20 February 2004. Summary of changes for version 20040220: + +1) ACPI CA Core Subsystem: + +Implemented execution of _SxD methods for Device objects in the +GetObjectInfo interface. + +Fixed calls to _SST method to pass the correct arguments. + +Added a call to _SST on wake to restore to "working" state. + +Check for End-Of-Buffer failure case in the WalkResources +interface. + +Integrated fix for 64-bit alignment issue in acglobal.h by moving +two structures to the beginning of the file. + +After wake, clear GPE status register(s) before enabling GPEs. + +After wake, clear/enable power button. (Perhaps we should +clear/enable all fixed events upon wake.) + +Fixed a couple of possible memory leaks in the Namespace manager. + +Integrated latest acnetbsd.h file. + +---------------------------------------- +11 February 2004. Summary of changes for version 20040211: + +1) ACPI CA Core Subsystem: + +Completed investigation and implementation of the call-by- +reference mechanism for control method arguments. + +Fixed a problem where a store of an object into an indexed +package could fail if the store occurs within a different method +than the method that created the package. + +Fixed a problem where the ToDecimal operator could return +incorrect results. + +Fixed a problem where the CopyObject operator could fail on some +of the more obscure objects (e.g., Reference objects.) + +Improved the output of the Debug object to display buffer, +package, and index objects. + +Fixed a problem where constructs of the form "RefOf (ArgX)" did +not return the expected result. + +Added permanent ACPI_REPORT_ERROR macros for all instances of the +ACPI_AML_INTERNAL exception. + +Integrated latest version of acfreebsd.h + +---------------------------------------- +16 January 2004. Summary of changes for version 20040116: + +The purpose of this release is primarily to update the copyright +years in each module, thus causing a huge number of diffs. There +are a few small functional changes, however. + +1) ACPI CA Core Subsystem: + +Improved error messages when there is a problem finding one or +more of the required base ACPI tables + +Reintroduced the definition of APIC_HEADER in actbl.h + +Changed definition of MADT_ADDRESS_OVERRIDE to 64 bits (actbl.h) + +Removed extraneous reference to NewObj in dsmthdat.c + +2) iASL compiler + +Fixed a problem introduced in December that disabled the correct +disassembly of Resource Templates + + +---------------------------------------- +03 December 2003. Summary of changes for version 20031203: + +1) ACPI CA Core Subsystem: + +Changed the initialization of Operation Regions during subsystem +init to perform two entire walks of the ACPI namespace; The first +to initialize the regions themselves, the second to execute the +_REG methods. This fixed some interdependencies across _REG +methods found on some machines. + +Fixed a problem where a Store(Local0, Local1) could simply update +the object reference count, and not create a new copy of the +object if the Local1 is uninitialized. + +Implemented support for the _SST reserved method during sleep +transitions. + +Implemented support to clear the SLP_TYP and SLP_EN bits when +waking up, this is apparently required by some machines. + +When sleeping, clear the wake status only if SleepState is not +S5. + +Fixed a problem in AcpiRsExtendedIrqResource() where an incorrect +pointer arithmetic advanced a string pointer too far. + +Fixed a problem in AcpiTbGetTablePtr() where a garbage pointer +could be returned if the requested table has not been loaded. + +Within the support for IRQ resources, restructured the handling +of +the active and edge/level bits. + +Fixed a few problems in AcpiPsxExecute() where memory could be +leaked under certain error conditions. + +Improved error messages for the cases where the ACPI mode could +not be entered. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler +and the compiler options used during generation. + + Previous Release (20031029): + Non-Debug Version: 74.4K Code, 10.1K Data, 84.5K Total + Debug Version: 158.3K Code, 65.0K Data, 223.3K Total + Current Release: + Non-Debug Version: 74.8K Code, 10.1K Data, 84.9K Total + Debug Version: 158.7K Code, 65.1K Data, 223.8K Total + +2) iASL Compiler/Disassembler: + +Implemented a fix for the iASL disassembler where a bad index was +generated. This was most noticeable on 64-bit platforms + + +---------------------------------------- +29 October 2003. Summary of changes for version 20031029: + +1) ACPI CA Core Subsystem: + +Fixed a problem where a level-triggered GPE with an associated +_Lxx control method was incorrectly cleared twice. + +Fixed a problem with the Field support code where an access can +occur beyond the end-of-region if the field is non-aligned but +extends to the very end of the parent region (resulted in an +AE_AML_REGION_LIMIT exception.) + +Fixed a problem with ACPI Fixed Events where an RT Clock handler +would not get invoked on an RTC event. The RTC event bitmasks +for +the PM1 registers were not being initialized properly. + +Implemented support for executing _STA and _INI methods for +Processor objects. Although this is currently not part of the +ACPI specification, there is existing ASL code that depends on +the +init-time execution of these methods. + +Implemented and deployed a GetDescriptorName function to decode +the various types of internal descriptors. Guards against null +descriptors during debug output also. + +Implemented and deployed a GetNodeName function to extract the 4- +character namespace node name. This function simplifies the +debug +and error output, as well as guarding against null pointers +during +output. + +Implemented and deployed the ACPI_FORMAT_UINT64 helper macro to +simplify the debug and error output of 64-bit integers. This +macro replaces the HIDWORD and LODWORD macros for dumping these +integers. + +Updated the implementation of the Stall() operator to only call +AcpiOsStall(), and also return an error if the operand is larger +than 255. This preserves the required behavior of not +relinquishing the processor, as would happen if AcpiOsSleep() was +called for "long stalls". + +Constructs of the form "Store(LocalX,LocalX)" where LocalX is not +initialized are now treated as NOOPs. + +Cleaned up a handful of warnings during 64-bit generation. + +Fixed a reported error where and incorrect GPE number was passed +to the GPE dispatch handler. This value is only used for error +output, however. Used this opportunity to clean up and +streamline +the GPE dispatch code. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler +and the compiler options used during generation. + + Previous Release (20031002): + Non-Debug Version: 74.1K Code, 9.7K Data, 83.8K Total + Debug Version: 157.9K Code, 64.8K Data, 222.7K Total + Current Release: + Non-Debug Version: 74.4K Code, 10.1K Data, 84.5K Total + Debug Version: 158.3K Code, 65.0K Data, 223.3K Total + + +2) iASL Compiler/Disassembler: + +Updated the iASL compiler to return an error if the operand to +the +Stall() operator is larger than 255. + + +---------------------------------------- +02 October 2003. Summary of changes for version 20031002: + + +1) ACPI CA Core Subsystem: + +Fixed a problem with Index Fields where the index was not +incremented for fields that require multiple writes to the +index/data registers (Fields that are wider than the data +register.) + +Fixed a problem with all Field objects where a write could go +beyond the end-of-field if the field was larger than the access +granularity and therefore required multiple writes to complete +the +request. An extra write beyond the end of the field could happen +inadvertently. + +Fixed a problem with Index Fields where a BUFFER_OVERFLOW error +would incorrectly be returned if the width of the Data Register +was larger than the specified field access width. + +Completed fixes for LoadTable() and Unload() and verified their +operation. Implemented full support for the "DdbHandle" object +throughout the ACPI CA subsystem. + +Implemented full support for the MADT and ECDT tables in the ACPI +CA header files. Even though these tables are not directly +consumed by ACPI CA, the header definitions are useful for ACPI +device drivers. + +Integrated resource descriptor fixes posted to the Linux ACPI +list. This included checks for minimum descriptor length, and +support for trailing NULL strings within descriptors that have +optional string elements. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler +and the compiler options used during generation. + + Previous Release (20030918): + Non-Debug Version: 73.9K Code, 9.7K Data, 83.6K Total + Debug Version: 157.3K Code, 64.5K Data, 221.8K Total + Current Release: + Non-Debug Version: 74.1K Code, 9.7K Data, 83.8K Total + Debug Version: 157.9K Code, 64.8K Data, 222.7K Total + + +2) iASL Compiler: + +Implemented detection of non-ASCII characters within the input +source ASL file. This catches attempts to compile binary (AML) +files early in the compile, with an informative error message. + +Fixed a problem where the disassembler would fault if the output +filename could not be generated or if the output file could not +be +opened. + +---------------------------------------- +18 September 2003. Summary of changes for version 20030918: + + +1) ACPI CA Core Subsystem: + +Found and fixed a longstanding problem with the late execution of +the various deferred AML opcodes (such as Operation Regions, +Buffer Fields, Buffers, and Packages). If the name string +specified for the name of the new object placed the object in a +scope other than the current scope, the initialization/execution +of the opcode failed. The solution to this problem was to +implement a mechanism where the late execution of such opcodes +does not attempt to lookup/create the name a second time in an +incorrect scope. This fixes the "region size computed +incorrectly" problem. + +Fixed a call to AcpiHwRegisterWrite in hwregs.c that was causing +a +Global Lock AE_BAD_PARAMETER error. + +Fixed several 64-bit issues with prototypes, casting and data +types. + +Removed duplicate prototype from acdisasm.h + +Fixed an issue involving EC Operation Region Detach (Shaohua Li) + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler +and the compiler options used during generation. + + Previous Release: + Non-Debug Version: 73.7K Code, 9.7K Data, 83.4K Total + Debug Version: 156.9K Code, 64.2K Data, 221.1K Total + Current Release: + Non-Debug Version: 73.9K Code, 9.7K Data, 83.6K Total + Debug Version: 157.3K Code, 64.5K Data, 221.8K Total + + +2) Linux: + +Fixed the AcpiOsSleep implementation in osunixxf.c to pass the +correct sleep time in seconds. + +---------------------------------------- +14 July 2003. Summary of changes for version 20030619: + +1) ACPI CA Core Subsystem: + +Parse SSDTs in order discovered, as opposed to reverse order +(Hrvoje Habjanic) + +Fixes from FreeBSD and NetBSD. (Frank van der Linden, Thomas +Klausner, + Nate Lawson) + + +2) Linux: + +Dynamically allocate SDT list (suggested by Andi Kleen) + +proc function return value cleanups (Andi Kleen) + +Correctly handle NMI watchdog during long stalls (Andrew Morton) + +Make it so acpismp=force works (reported by Andrew Morton) + + +---------------------------------------- 19 June 2003. Summary of changes for version 20030619: 1) ACPI CA Core Subsystem: @@ -29,8 +394,6 @@ Add ASUS Value-add driver (Karol Kozimor and Julien Lerouge) - - ---------------------------------------- 22 May 2003. Summary of changes for version 20030522: @@ -40,22 +403,26 @@ occurred occasionally during _BST evaluation. This turned out to be an Owner ID allocation issue where a called method did not get a new ID assigned to it. Eventually, (after 64k calls), the -Owner ID UINT16 would wraparound so that the ID would be the same -as the caller's and the called method would delete the caller's +Owner +ID UINT16 would wraparound so that the ID would be the same as +the +caller's and the called method would delete the caller's namespace. Implemented extended error reporting for control methods that are aborted due to a run-time exception. Output includes the exact AML instruction that caused the method abort, a dump of the -method locals and arguments at the time of the abort, and a trace -of all nested control method calls. +method +locals and arguments at the time of the abort, and a trace of all +nested control method calls. Modified the interpreter to allow the creation of buffers of zero length from the AML code. Implemented new code to ensure that no attempt is made to actually allocate a memory buffer (of length zero) - instead, a simple buffer object with a NULL buffer -pointer and length zero is created. A warning is no longer -issued when the AML attempts to create a zero-length buffer. +pointer +and length zero is created. A warning is no longer issued when +the AML attempts to create a zero-length buffer. Implemented a workaround for the "leading asterisk issue" in _HIDs, _UIDs, and _CIDs in the AML interpreter. One leading @@ -64,10 +431,12 @@ an error, however. Implemented full support for _CID methods that return a package -of multiple CIDs (Compatible IDs). The AcpiGetObjectInfo() -interface now additionally returns a device _CID list if present. -This required a change to the external interface in order to pass -an ACPI_BUFFER object as a parameter since the _CID list is of +of +multiple CIDs (Compatible IDs). The AcpiGetObjectInfo() +interface +now additionally returns a device _CID list if present. This +required a change to the external interface in order to pass an +ACPI_BUFFER object as a parameter since the _CID list is of variable length. Fixed a problem with the new AE_SAME_HANDLER exception where @@ -80,7 +449,8 @@ debug version of the code includes the debug output trace mechanism and has a much larger code and data size. Note that these values will vary depending on the efficiency of the -compiler and the compiler options used during generation. +compiler +and the compiler options used during generation. Previous Release (20030509): Non-Debug Version: 73.4K Code, 9.7K Data, 83.1K Total @@ -94,7 +464,8 @@ Fixed a bug in which we would reinitialize the ACPI interrupt after it was already working, thus disabling all ACPI and the -IRQs for any other device sharing the interrupt. (Thanks to Stian +IRQs +for any other device sharing the interrupt. (Thanks to Stian Jordet) Toshiba driver update (John Belmonte) @@ -114,8 +485,9 @@ 4) Documentation: Added changes to existing interfaces, new exception codes, and -new text concerning reference count object management versus -garbage collection. +new +text concerning reference count object management versus garbage +collection. ---------------------------------------- 09 May 2003. Summary of changes for version 20030509. @@ -125,14 +497,18 @@ Changed the subsystem initialization sequence to hold off installation of address space handlers until the hardware has -been initialized and the system has entered ACPI mode. This is -because the installation of space handlers can cause _REG methods -to be run. Previously, the _REG methods could potentially be run -before ACPI mode was enabled. +been +initialized and the system has entered ACPI mode. This is +because +the installation of space handlers can cause _REG methods to be +run. Previously, the _REG methods could potentially be run +before +ACPI mode was enabled. Fixed some memory leak issues related to address space handler -and notify handler installation. There were some problems with -the reference count mechanism caused by the fact that the handler +and +notify handler installation. There were some problems with the +reference count mechanism caused by the fact that the handler objects are shared across several namespace objects. Fixed a reported problem where reference counts within the @@ -145,8 +521,9 @@ Fixed a problem where the table ID associated with secondary tables (SSDTs) was not being propagated into the namespace -objects created by those tables. This would only present a -problem for tables that are unloaded at run-time, however. +objects +created by those tables. This would only present a problem for +tables that are unloaded at run-time, however. Updated AcpiOsReadable and AcpiOsWritable to use the ACPI_SIZE type as the length parameter (instead of UINT32). @@ -163,13 +540,15 @@ the only child, but first in the list of children.) Code and Data Size: Current core subsystem library sizes are -shown below. These are the code and data sizes for the -acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and -these values do not include any ACPI driver or OSPM code. The -debug version of the code includes the debug output trace -mechanism and has a much larger code and data size. Note that -these values will vary depending on the efficiency of the -compiler and the compiler options used during generation. +shown +below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these +values do not include any ACPI driver or OSPM code. The debug +version of the code includes the debug output trace mechanism and +has a much larger code and data size. Note that these values +will +vary depending on the efficiency of the compiler and the compiler +options used during generation. Previous Release Non-Debug Version: 73.7K Code, 9.5K Data, 83.2K Total @@ -191,8 +570,9 @@ Fixed a problem in the generation of the C source code files (AML is emitted in C source statements for BIOS inclusion) where the Ascii dump that appears within a C comment at the end of each -line could cause a compile time error if the AML sequence happens -to have an open comment or close comment sequence embedded. +line +could cause a compile time error if the AML sequence happens to +have an open comment or close comment sequence embedded. ---------------------------------------- @@ -203,13 +583,15 @@ Support for big-endian systems has been implemented. Most of the support has been invisibly added behind big-endian versions of -the ACPI_MOVE_* macros. +the +ACPI_MOVE_* macros. Fixed a problem in AcpiHwDisableGpeBlock() and AcpiHwClearGpeBlock() where an incorrect offset was passed to the low level hardware write routine. The offset parameter was actually eliminated from the low level read/write routines -because they had become obsolete. +because +they had become obsolete. Fixed a problem where a handler object was deleted twice during the removal of a fixed event handler. @@ -222,7 +604,8 @@ (2.5) Return whether we handled the interrupt in our IRQ handler. (Linux ISRs no longer return void, so we can propagate the -handler return value from the ACPI CA core back to the OS.) +handler +return value from the ACPI CA core back to the OS.) 3) Documentation: @@ -246,13 +629,15 @@ controller (EC). Code and Data Size: Current core subsystem library sizes are -shown below. These are the code and data sizes for the -acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and -these values do not include any ACPI driver or OSPM code. The -debug version of the code includes the debug output trace -mechanism and has a much larger code and data size. Note that -these values will vary depending on the efficiency of the -compiler and the compiler options used during generation. +shown +below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these +values do not include any ACPI driver or OSPM code. The debug +version of the code includes the debug output trace mechanism and +has a much larger code and data size. Note that these values +will +vary depending on the efficiency of the compiler and the compiler +options used during generation. Previous Release Non-Debug Version: 72.3K Code, 9.5K Data, 81.8K Total @@ -278,9 +663,10 @@ fields that are used to determine the GPE block lengths. The REGISTER_BIT_WIDTH field of the X_GPEx_BLK extended address structures are ignored. This is per the ACPI specification but -it isn't very clear. The full 256 Block 0/1 GPEs are now -supported (the use of REGISTER_BIT_WIDTH limited the number of -GPEs to 128). +it +isn't very clear. The full 256 Block 0/1 GPEs are now supported +(the use of REGISTER_BIT_WIDTH limited the number of GPEs to +128). In the SCI interrupt handler, removed the read of the PM1_CONTROL register to look at the SCI_EN bit. On some machines, this read @@ -289,21 +675,24 @@ systems.) Fixed a problem where a store of a NULL string to a package -object could cause the premature deletion of the object. This -was seen during execution of the battery _BIF method on some -systems, resulting in no battery data being returned. +object +could cause the premature deletion of the object. This was seen +during execution of the battery _BIF method on some systems, +resulting in no battery data being returned. Added AcpiWalkResources interface to simplify parsing of resource lists. Code and Data Size: Current core subsystem library sizes are -shown below. These are the code and data sizes for the -acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and -these values do not include any ACPI driver or OSPM code. The -debug version of the code includes the debug output trace -mechanism and has a much larger code and data size. Note that -these values will vary depending on the efficiency of the -compiler and the compiler options used during generation. +shown +below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these +values do not include any ACPI driver or OSPM code. The debug +version of the code includes the debug output trace mechanism and +has a much larger code and data size. Note that these values +will +vary depending on the efficiency of the compiler and the compiler +options used during generation. Previous Release Non-Debug Version: 72.0K Code, 9.5K Data, 81.5K Total @@ -325,7 +714,8 @@ Map in entire table before performing checksum (John Stultz) Expand the mem= cmdline to allow the specification of reserved -and ACPI DATA blocks (Pavel Machek) +and +ACPI DATA blocks (Pavel Machek) Never use ACPI on VISWS @@ -356,9 +746,10 @@ Added a check for constructs of the form: Store (Local0, Local0) where Local0 is not initialized. Apparently, some BIOS programmers believe that this is a NOOP. Since this store -doesn't do anything anyway, the new prototype behavior will -ignore this error. This is a case where we can relax the strict -checking in the interpreter in the name of compatibility. +doesn't +do anything anyway, the new prototype behavior will ignore this +error. This is a case where we can relax the strict checking in +the interpreter in the name of compatibility. 2) Linux @@ -382,7 +773,8 @@ (Both) acpiphp.h includes both linux/acpi.h and acpi_bus.h. Since the former now also includes the latter, acpiphp.h only needs the -one, now. +one, +now. (2.5) Make it possible to select method of bios restoring after S3 @@ -416,17 +808,21 @@ Changed the behavior of the internal Buffer-to-String conversion function. The current ACPI specification states that the -contents of the buffer are "converted to a string of two- -character hexadecimal numbers, each separated by a space". -Unfortunately, this definition is not backwards compatible with -existing ACPI 1.0 implementations (although the behavior was not -defined in the ACPI 1.0 specification). The new behavior simply -copies data from the buffer to the string until a null character -is found or the end of the buffer is reached. The new String -object is always null terminated. This problem was seen during -the generation of _BIF battery data where incorrect strings were -returned for battery type, etc. This will also require an errata -to the ACPI specification. +contents +of the buffer are "converted to a string of two-character +hexadecimal numbers, each separated by a space". Unfortunately, +this definition is not backwards compatible with existing ACPI +1.0 +implementations (although the behavior was not defined in the +ACPI +1.0 specification). The new behavior simply copies data from the +buffer to the string until a null character is found or the end +of +the buffer is reached. The new String object is always null +terminated. This problem was seen during the generation of _BIF +battery data where incorrect strings were returned for battery +type, etc. This will also require an errata to the ACPI >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 29 20:39:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67E9416A4D0; Sun, 29 Feb 2004 20:39:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4128016A4CE for ; Sun, 29 Feb 2004 20:39:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39FE843D1D for ; Sun, 29 Feb 2004 20:39:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i214djGe021859 for ; Sun, 29 Feb 2004 20:39:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i214diTU021856 for perforce@freebsd.org; Sun, 29 Feb 2004 20:39:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Feb 2004 20:39:44 -0800 (PST) Message-Id: <200403010439.i214diTU021856@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 47890 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, 01 Mar 2004 04:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=47890 Change 47890 by rwatson@rwatson_tislabs on 2004/02/29 20:38:43 Integrate netperf_socket branch to loop back recent merge of sodupsockaddr(), flag fix for soalloc(). Affected files ... .. //depot/projects/netperf_socket/sys/conf/NOTES#4 integrate .. //depot/projects/netperf_socket/sys/conf/files#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/ubser.h#1 branch .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/ubser/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netnatm/natm.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#4 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1201 2004/02/28 20:56:34 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1202 2004/03/01 02:34:48 ticso Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2167,6 +2167,8 @@ device uvscom # USB Visor and Palm devices device uvisor +# USB support for BWCT console serial adapters +device ubser # USB Fm Radio device ufm ==== //depot/projects/netperf_socket/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.869 2004/02/28 23:04:45 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.870 2004/03/01 02:34:48 ticso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -822,6 +822,7 @@ dev/usb/ohci.c optional ohci dev/usb/ohci_pci.c optional ohci pci dev/usb/ubsa.c optional ubsa ucom +dev/usb/ubser.c optional ubser dev/usb/ucom.c optional ucom dev/usb/udbp.c optional udbp dev/usb/ufm.c optional ufm ==== //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.59 2003/03/03 19:15:38 njl Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.60 2004/03/01 03:14:21 rwatson Exp $ */ /* @@ -199,7 +199,8 @@ unp3 = sotounpcb(so3); if (unp2->unp_addr) unp3->unp_addr = (struct sockaddr_un *) - dup_sockaddr((struct sockaddr *)unp2->unp_addr, 0); + sodupsockaddr((struct sockaddr *)unp2->unp_addr, + M_NOWAIT); so2 = so3; return (unp_connect2(so, so2)); ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.163 2004/02/29 17:54:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.165 2004/03/01 03:14:21 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -138,7 +138,7 @@ so = uma_zalloc(socket_zone, mflags | M_ZERO); if (so) { #ifdef MAC - error = mac_init_socket(so, flag); + error = mac_init_socket(so, mflags); if (error != 0) { uma_zfree(socket_zone, so); so = NULL; ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.120 2004/02/29 17:54:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.121 2004/03/01 03:14:21 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -1308,7 +1308,7 @@ { struct sockaddr *sa2; - MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, mflags); + sa2 = malloc(sa->sa_len, M_SONAME, mflags); if (sa2) bcopy(sa, sa2, sa->sa_len); return sa2; ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.116 2004/02/22 01:11:53 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.117 2004/03/01 03:14:21 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/netperf_socket/sys/modules/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.368 2004/02/28 00:12:46 sanpei Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.369 2004/03/01 02:34:49 ticso Exp $ # pcic -- currently broken and being worked on out of tree. # oldcard -- specialized use for debugging only. @@ -205,6 +205,7 @@ uart \ ubsa \ ubsec \ + ubser \ ucom \ udav \ udbp \ ==== //depot/projects/netperf_socket/sys/net/raw_usrreq.c#3 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.30 2003/11/18 00:39:03 rwatson Exp $ + * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.31 2004/03/01 03:14:21 rwatson Exp $ */ #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.33 2003/11/18 00:39:03 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.34 2004/03/01 03:14:22 rwatson Exp $ */ #include ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.11 2004/01/26 15:19:43 harti Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.12 2004/03/01 03:14:22 rwatson Exp $ */ #include @@ -1560,7 +1560,7 @@ sa.hci_family = AF_BLUETOOTH; strlcpy(sa.hci_node, pcb->addr.hci_node, sizeof(sa.hci_node)); - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_hci_raw_sockaddr */ ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.9 2003/12/24 18:51:01 alfred Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.10 2004/03/01 03:14:22 rwatson Exp $ */ #include @@ -2435,7 +2435,7 @@ sa.l2cap_len = sizeof(sa); sa.l2cap_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_l2cap_peeraddr */ @@ -2588,7 +2588,7 @@ sa.l2cap_len = sizeof(sa); sa.l2cap_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_l2cap_sockaddr */ ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.8 2003/12/24 18:51:01 alfred Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.9 2004/03/01 03:14:22 rwatson Exp $ */ #include @@ -1180,7 +1180,7 @@ sa.l2cap_len = sizeof(sa); sa.l2cap_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_l2cap_raw_peeraddr */ @@ -1219,7 +1219,7 @@ sa.l2cap_len = sizeof(sa); sa.l2cap_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_l2cap_raw_sockaddr */ ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.3 2003/10/12 22:04:21 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.4 2004/03/01 03:14:22 rwatson Exp $ */ #include @@ -879,7 +879,7 @@ sa.rfcomm_len = sizeof(sa); sa.rfcomm_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_rfcomm_peeraddr */ @@ -945,7 +945,7 @@ sa.rfcomm_len = sizeof(sa); sa.rfcomm_family = AF_BLUETOOTH; - *nam = dup_sockaddr((struct sockaddr *) &sa, 0); + *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); } /* ng_btsocket_rfcomm_sockaddr */ ==== //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.26 2003/06/11 05:25:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.27 2004/03/01 03:14:22 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.40 2003/11/18 00:39:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.41 2004/03/01 03:14:22 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netnatm/natm.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.31 2003/11/18 00:39:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.32 2004/03/01 03:14:22 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.11 2004/02/26 00:27:03 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.12 2004/03/01 03:14:22 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.18 2003/06/11 05:32:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.19 2004/03/01 03:14:22 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.147 2004/02/22 01:17:47 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.148 2004/03/01 03:14:23 rwatson Exp $"); #include "opt_bootp.h" #include "opt_nfsroot.h" ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.35 2003/03/02 16:54:38 des Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.36 2004/03/01 03:14:23 rwatson Exp $"); /* * Reference: Chet Juszczak, "Improving the Performance and Correctness @@ -50,7 +50,7 @@ #include #include #include -#include /* for dup_sockaddr */ +#include /* for sodupsockaddr */ #include #include ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.109 2004/02/29 17:54:05 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.110 2004/03/01 03:14:23 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ ==== //depot/projects/netperf_socket/sys/vm/vm_mmap.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.180 2004/02/27 22:02:15 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.181 2004/03/01 02:44:33 kan Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -284,16 +284,14 @@ lim_max(td->td_proc, RLIMIT_DATA)); PROC_UNLOCK(td->td_proc); } - do { - if (flags & MAP_ANON) { - /* - * Mapping blank space is trivial. - */ - handle = NULL; - maxprot = VM_PROT_ALL; - pos = 0; - break; - } + if (flags & MAP_ANON) { + /* + * Mapping blank space is trivial. + */ + handle = NULL; + maxprot = VM_PROT_ALL; + pos = 0; + } else { /* * Mapping file, get fp for validation. Obtain vnode and make * sure it is of appropriate type. @@ -350,7 +348,7 @@ maxprot |= VM_PROT_WRITE; } handle = (void *)vp; - } while (0); + } /* * Do not allow more then a certain number of vm_map_entry structures From owner-p4-projects@FreeBSD.ORG Sun Feb 29 22:17:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4DF716A4D0; Sun, 29 Feb 2004 22:17:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC17F16A4CE for ; Sun, 29 Feb 2004 22:17:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA0943D1D for ; Sun, 29 Feb 2004 22:17:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i216HmGe049438 for ; Sun, 29 Feb 2004 22:17:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i216Hm67049435 for perforce@freebsd.org; Sun, 29 Feb 2004 22:17:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 29 Feb 2004 22:17:48 -0800 (PST) Message-Id: <200403010617.i216Hm67049435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 47897 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, 01 Mar 2004 06:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=47897 Change 47897 by jmallett@jmallett_oingo on 2004/02/29 22:17:32 Unused. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#20 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#20 (text+ko) ==== @@ -91,12 +91,10 @@ * G: Global bit. This means that this mapping is present * in EVERY address space, and to ignore the ASID when * it is matched. - * HW: Mask of all hardware bits. */ #define PG_D 0x04 #define PG_V 0x02 #define PG_G 0x01 -#define PG_HW (PG_D | PG_V | PG_G) /* * VM flags managed in software: From owner-p4-projects@FreeBSD.ORG Sun Feb 29 23:22:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A5BA16A4D0; Sun, 29 Feb 2004 23:22:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2656F16A4CE for ; Sun, 29 Feb 2004 23:22:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE8443D39 for ; Sun, 29 Feb 2004 23:22:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i217MHGe064214 for ; Sun, 29 Feb 2004 23:22:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i217M7xD064052 for perforce@freebsd.org; Sun, 29 Feb 2004 23:22:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 29 Feb 2004 23:22:07 -0800 (PST) Message-Id: <200403010722.i217M7xD064052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 47899 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, 01 Mar 2004 07:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=47899 Change 47899 by jmallett@jmallett_oingo on 2004/02/29 23:21:16 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#13 integrate .. //depot/projects/mips/Makefile#9 integrate .. //depot/projects/mips/Makefile.inc1#21 integrate .. //depot/projects/mips/UPDATING#14 integrate .. //depot/projects/mips/bin/chflags/chflags.c#3 integrate .. //depot/projects/mips/bin/csh/Makefile#4 integrate .. //depot/projects/mips/bin/df/df.c#7 integrate .. //depot/projects/mips/bin/kill/kill.c#3 integrate .. //depot/projects/mips/bin/ps/Makefile#5 integrate .. //depot/projects/mips/bin/ps/keyword.c#7 integrate .. //depot/projects/mips/bin/ps/ps.c#6 integrate .. //depot/projects/mips/bin/rmail/Makefile#3 integrate .. //depot/projects/mips/bin/sh/Makefile#4 integrate .. //depot/projects/mips/bin/sh/eval.c#5 integrate .. //depot/projects/mips/bin/sh/jobs.c#6 integrate .. //depot/projects/mips/bin/sh/trap.c#2 integrate .. //depot/projects/mips/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/contrib/bc/bc/main.c#2 integrate .. //depot/projects/mips/contrib/bc/h/getopt.h#2 delete .. //depot/projects/mips/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/mips/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/mips/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/contrib/cpio/getopt.c#2 delete .. //depot/projects/mips/contrib/cpio/getopt.h#2 delete .. //depot/projects/mips/contrib/cpio/getopt1.c#2 delete .. //depot/projects/mips/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/contrib/diff/diff.h#2 integrate .. //depot/projects/mips/contrib/diff/getopt.c#2 delete .. //depot/projects/mips/contrib/diff/getopt.h#2 delete .. //depot/projects/mips/contrib/diff/getopt1.c#2 delete .. //depot/projects/mips/contrib/gcc/FREEBSD-Xlist#2 integrate .. //depot/projects/mips/contrib/gcc/FREEBSD-deletelist#2 integrate .. //depot/projects/mips/contrib/gcc/config/freebsd-spec.h#5 integrate .. //depot/projects/mips/contrib/gcc/getopt.c#3 delete .. //depot/projects/mips/contrib/gcc/getopt.h#4 delete .. //depot/projects/mips/contrib/gcc/getopt1.c#2 delete .. //depot/projects/mips/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/mips/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/mips/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/mips/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/mips/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/mips/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/mips/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/mips/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/mips/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/mips/contrib/groff/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/contrib/groff/src/include/getopt.h#3 delete .. //depot/projects/mips/contrib/groff/src/libs/libgroff/getopt.c#3 delete .. //depot/projects/mips/contrib/groff/src/libs/libgroff/getopt1.c#3 delete .. //depot/projects/mips/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/mips/contrib/libreadline/bind.c#3 integrate .. //depot/projects/mips/contrib/libreadline/complete.c#3 integrate .. //depot/projects/mips/contrib/libreadline/display.c#3 integrate .. //depot/projects/mips/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/mips/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/mips/contrib/libreadline/readline.c#3 integrate .. //depot/projects/mips/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/mips/contrib/libreadline/shell.c#3 integrate .. //depot/projects/mips/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/mips/contrib/libreadline/util.c#3 integrate .. //depot/projects/mips/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/mips/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/mips/contrib/one-true-awk/FREEBSD-upgrade#5 integrate .. //depot/projects/mips/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/mips/contrib/one-true-awk/lex.c#4 integrate .. //depot/projects/mips/contrib/one-true-awk/main.c#5 integrate .. //depot/projects/mips/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/mips/contrib/openpam/CREDITS#5 integrate .. //depot/projects/mips/contrib/openpam/HISTORY#5 integrate .. //depot/projects/mips/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/mips/contrib/openpam/RELNOTES#5 integrate .. //depot/projects/mips/contrib/openpam/configure#2 integrate .. //depot/projects/mips/contrib/openpam/configure.in#2 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_free_data.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_get_option.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_log.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_set_option.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_authenticate.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_close_session.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_conv.3#4 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_end.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_error.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_data.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_item.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_get_user.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_getenv.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_info.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_open_session.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_prompt.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_putenv.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_set_data.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_set_item.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_setcred.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_setenv.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_start.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_strerror.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_verror.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_vinfo.3#5 integrate .. //depot/projects/mips/contrib/openpam/doc/man/pam_vprompt.3#5 integrate .. //depot/projects/mips/contrib/openpam/include/security/openpam.h#4 integrate .. //depot/projects/mips/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/mips/contrib/openpam/include/security/pam_appl.h#4 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_borrow_cred.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_restore_cred.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_authtok.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_data.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_get_user.c#6 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_vprompt.c#6 integrate .. //depot/projects/mips/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/mips/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/mips/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/mips/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/mips/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/mips/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/mips/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/mips/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/mips/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/mips/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/mips/contrib/pf/man/pf.4#1 branch .. //depot/projects/mips/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/mips/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/mips/contrib/pf/man/pflog.4#1 branch .. //depot/projects/mips/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/mips/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/mips/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/mips/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/mips/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/mips/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/mips/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/mips/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/mips/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/mips/contrib/sendmail/RELEASE_NOTES#6 integrate .. //depot/projects/mips/contrib/sendmail/cf/README#6 integrate .. //depot/projects/mips/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/cfhead.m4#5 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/mips/contrib/sendmail/cf/m4/version.m4#6 integrate .. //depot/projects/mips/contrib/sendmail/doc/op/op.me#6 integrate .. //depot/projects/mips/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/mips/contrib/sendmail/include/libmilter/milter.h#3 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/cdefs.h#2 integrate .. //depot/projects/mips/contrib/sendmail/include/sm/conf.h#5 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/engine.c#4 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/libmilter.h#5 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/listener.c#5 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/main.c#4 integrate .. //depot/projects/mips/contrib/sendmail/libmilter/signal.c#4 integrate .. //depot/projects/mips/contrib/sendmail/libsm/assert.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/mips/contrib/sendmail/libsm/ldap.c#3 integrate .. //depot/projects/mips/contrib/sendmail/libsm/local.h#3 integrate .. //depot/projects/mips/contrib/sendmail/smrsh/smrsh.8#3 integrate .. //depot/projects/mips/contrib/sendmail/smrsh/smrsh.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/README#6 integrate .. //depot/projects/mips/contrib/sendmail/src/alias.c#3 integrate .. //depot/projects/mips/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/daemon.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/deliver.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/mips/contrib/sendmail/src/main.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/milter.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/mime.c#3 integrate .. //depot/projects/mips/contrib/sendmail/src/queue.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/readcf.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/recipient.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/sendmail.8#3 integrate .. //depot/projects/mips/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/mips/contrib/sendmail/src/srvrsmtp.c#6 integrate .. //depot/projects/mips/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/mips/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/mips/contrib/sendmail/src/version.c#6 integrate .. //depot/projects/mips/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/mips/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/mips/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/mips/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/mips/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/mips/contrib/texinfo/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/contrib/texinfo/lib/getopt.c#3 delete .. //depot/projects/mips/contrib/texinfo/lib/getopt.h#3 delete .. //depot/projects/mips/contrib/texinfo/lib/getopt1.c#3 delete .. //depot/projects/mips/crypto/openssh/CREDITS#4 integrate .. //depot/projects/mips/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/mips/crypto/openssh/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/mips/crypto/openssh/INSTALL#4 integrate .. //depot/projects/mips/crypto/openssh/LICENCE#3 integrate .. //depot/projects/mips/crypto/openssh/Makefile.in#5 integrate .. //depot/projects/mips/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/mips/crypto/openssh/README#3 integrate .. //depot/projects/mips/crypto/openssh/README.dns#2 integrate .. //depot/projects/mips/crypto/openssh/README.platform#1 branch .. //depot/projects/mips/crypto/openssh/README.privsep#4 integrate .. //depot/projects/mips/crypto/openssh/README.smartcard#3 integrate .. //depot/projects/mips/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/mips/crypto/openssh/TODO#5 integrate .. //depot/projects/mips/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/mips/crypto/openssh/acconfig.h#6 integrate .. //depot/projects/mips/crypto/openssh/acss.c#1 branch .. //depot/projects/mips/crypto/openssh/acss.h#1 branch .. //depot/projects/mips/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/mips/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/mips/crypto/openssh/auth-pam.c#6 integrate .. //depot/projects/mips/crypto/openssh/auth-pam.h#5 integrate .. //depot/projects/mips/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/mips/crypto/openssh/auth-rh-rsa.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/mips/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/mips/crypto/openssh/auth.c#5 integrate .. //depot/projects/mips/crypto/openssh/auth.h#5 integrate .. //depot/projects/mips/crypto/openssh/auth1.c#6 integrate .. //depot/projects/mips/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/mips/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2.c#6 integrate .. //depot/projects/mips/crypto/openssh/authfd.c#6 integrate .. //depot/projects/mips/crypto/openssh/authfd.h#5 integrate .. //depot/projects/mips/crypto/openssh/authfile.c#5 integrate .. //depot/projects/mips/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/mips/crypto/openssh/bufaux.h#3 integrate .. //depot/projects/mips/crypto/openssh/buffer.c#4 integrate .. //depot/projects/mips/crypto/openssh/canohost.c#6 integrate .. //depot/projects/mips/crypto/openssh/channels.c#7 integrate .. //depot/projects/mips/crypto/openssh/channels.h#4 integrate .. //depot/projects/mips/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/mips/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/mips/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/mips/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/mips/crypto/openssh/cipher.c#6 integrate .. //depot/projects/mips/crypto/openssh/cipher.h#2 integrate .. //depot/projects/mips/crypto/openssh/cleanup.c#1 branch .. //depot/projects/mips/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/mips/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/mips/crypto/openssh/compat.c#5 integrate .. //depot/projects/mips/crypto/openssh/compat.h#6 integrate .. //depot/projects/mips/crypto/openssh/compress.c#2 integrate .. //depot/projects/mips/crypto/openssh/config.guess#4 integrate .. //depot/projects/mips/crypto/openssh/config.h#5 integrate .. //depot/projects/mips/crypto/openssh/config.sub#4 integrate .. //depot/projects/mips/crypto/openssh/configure.ac#5 integrate .. //depot/projects/mips/crypto/openssh/defines.h#5 integrate .. //depot/projects/mips/crypto/openssh/dh.c#5 integrate .. //depot/projects/mips/crypto/openssh/dns.c#2 integrate .. //depot/projects/mips/crypto/openssh/dns.h#2 integrate .. //depot/projects/mips/crypto/openssh/entropy.c#3 integrate .. //depot/projects/mips/crypto/openssh/fatal.c#2 integrate .. //depot/projects/mips/crypto/openssh/fixprogs#2 integrate .. //depot/projects/mips/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/mips/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/mips/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/mips/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/mips/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/mips/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/mips/crypto/openssh/includes.h#5 integrate .. //depot/projects/mips/crypto/openssh/install-sh#2 integrate .. //depot/projects/mips/crypto/openssh/kex.c#3 integrate .. //depot/projects/mips/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/mips/crypto/openssh/key.c#6 integrate .. //depot/projects/mips/crypto/openssh/key.h#4 integrate .. //depot/projects/mips/crypto/openssh/log.c#5 integrate .. //depot/projects/mips/crypto/openssh/log.h#5 integrate .. //depot/projects/mips/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/mips/crypto/openssh/mac.c#2 integrate .. //depot/projects/mips/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/mips/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/mips/crypto/openssh/misc.c#5 integrate .. //depot/projects/mips/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/mips/crypto/openssh/moduli#2 integrate .. //depot/projects/mips/crypto/openssh/moduli.c#2 integrate .. //depot/projects/mips/crypto/openssh/monitor.c#6 integrate .. //depot/projects/mips/crypto/openssh/monitor.h#4 integrate .. //depot/projects/mips/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/mips/crypto/openssh/monitor_wrap.h#4 integrate .. //depot/projects/mips/crypto/openssh/msg.c#5 integrate .. //depot/projects/mips/crypto/openssh/msg.h#4 integrate .. //depot/projects/mips/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/mips/crypto/openssh/nchan2.ms#2 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/mips/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/dirname.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/getopt.c#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntoa.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcat.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcpy.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/strsep.c#4 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/mips/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/mips/crypto/openssh/packet.c#6 integrate .. //depot/projects/mips/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/mips/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/mips/crypto/openssh/readconf.c#5 integrate .. //depot/projects/mips/crypto/openssh/readconf.h#4 integrate .. //depot/projects/mips/crypto/openssh/regress/Makefile#4 integrate .. //depot/projects/mips/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/mips/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/mips/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/mips/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/mips/crypto/openssh/regress/sftp-batch.sh#3 integrate .. //depot/projects/mips/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/mips/crypto/openssh/regress/ssh-com.sh#4 integrate .. //depot/projects/mips/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/mips/crypto/openssh/rijndael.c#4 integrate .. //depot/projects/mips/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/mips/crypto/openssh/scp.1#4 integrate .. //depot/projects/mips/crypto/openssh/scp.c#6 integrate .. //depot/projects/mips/crypto/openssh/servconf.c#5 integrate .. //depot/projects/mips/crypto/openssh/servconf.h#4 integrate .. //depot/projects/mips/crypto/openssh/serverloop.c#6 integrate .. //depot/projects/mips/crypto/openssh/session.c#7 integrate .. //depot/projects/mips/crypto/openssh/session.h#5 integrate .. //depot/projects/mips/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/mips/crypto/openssh/sftp-client.h#3 integrate .. //depot/projects/mips/crypto/openssh/sftp-common.c#5 integrate .. //depot/projects/mips/crypto/openssh/sftp-common.h#3 integrate .. //depot/projects/mips/crypto/openssh/sftp-glob.c#3 integrate .. //depot/projects/mips/crypto/openssh/sftp-glob.h#3 delete .. //depot/projects/mips/crypto/openssh/sftp-int.c#5 delete .. //depot/projects/mips/crypto/openssh/sftp-int.h#3 delete .. //depot/projects/mips/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/mips/crypto/openssh/sftp-server.c#5 integrate .. //depot/projects/mips/crypto/openssh/sftp.1#5 integrate .. //depot/projects/mips/crypto/openssh/sftp.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/mips/crypto/openssh/ssh-add.c#6 integrate .. //depot/projects/mips/crypto/openssh/ssh-agent.c#7 integrate .. //depot/projects/mips/crypto/openssh/ssh-dss.c#4 integrate .. //depot/projects/mips/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/mips/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/mips/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh-keyscan.c#6 integrate .. //depot/projects/mips/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/mips/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh-rsa.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh.1#5 integrate .. //depot/projects/mips/crypto/openssh/ssh.c#5 integrate .. //depot/projects/mips/crypto/openssh/ssh.h#5 integrate .. //depot/projects/mips/crypto/openssh/ssh_config#7 integrate .. //depot/projects/mips/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/mips/crypto/openssh/ssh_prng_cmds.in#3 integrate .. //depot/projects/mips/crypto/openssh/sshconnect.c#6 integrate .. //depot/projects/mips/crypto/openssh/sshconnect2.c#6 integrate .. //depot/projects/mips/crypto/openssh/sshd.8#6 integrate .. //depot/projects/mips/crypto/openssh/sshd.c#7 integrate .. //depot/projects/mips/crypto/openssh/sshd_config#7 integrate .. //depot/projects/mips/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/mips/crypto/openssh/sshpty.c#6 integrate .. //depot/projects/mips/crypto/openssh/sshtty.c#3 integrate .. //depot/projects/mips/crypto/openssh/sshtty.h#2 integrate .. //depot/projects/mips/crypto/openssh/uidswap.c#4 integrate .. //depot/projects/mips/crypto/openssh/uuencode.c#3 integrate .. //depot/projects/mips/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/mips/crypto/openssh/version.h#7 integrate .. //depot/projects/mips/etc/defaults/rc.conf#16 integrate .. //depot/projects/mips/etc/devd.conf#6 integrate .. //depot/projects/mips/etc/etc.powerpc/ttys#1 branch .. //depot/projects/mips/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/mips/etc/mtree/BSD.local.dist#9 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#12 integrate .. //depot/projects/mips/etc/namedb/named.root#3 integrate .. //depot/projects/mips/etc/netstart#4 integrate .. //depot/projects/mips/etc/pam.d/xdm#6 integrate .. //depot/projects/mips/etc/periodic/daily/110.clean-tmps#3 integrate .. //depot/projects/mips/etc/rc#7 integrate .. //depot/projects/mips/etc/rc.d/Makefile#9 integrate .. //depot/projects/mips/etc/rc.d/cleartmp#5 integrate .. //depot/projects/mips/etc/rc.d/dhclient#5 integrate .. //depot/projects/mips/etc/rc.d/dumpon#2 integrate .. //depot/projects/mips/etc/rc.d/gbde#2 integrate .. //depot/projects/mips/etc/rc.d/gbde_swap#1 branch .. //depot/projects/mips/etc/rc.d/ip6fw#4 integrate .. //depot/projects/mips/etc/rc.d/jail#5 integrate .. //depot/projects/mips/etc/rc.d/netif#3 integrate .. //depot/projects/mips/etc/rc.d/nfslocking#4 integrate .. //depot/projects/mips/etc/rc.d/random#4 integrate .. //depot/projects/mips/etc/rc.d/ttys#4 delete .. //depot/projects/mips/etc/rc.subr#9 integrate .. //depot/projects/mips/etc/remote#4 integrate .. //depot/projects/mips/games/factor/Makefile#5 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/mips/games/fortune/datfiles/freebsd-tips#8 integrate .. //depot/projects/mips/games/morse/morse.6#3 integrate .. //depot/projects/mips/games/morse/morse.c#3 integrate .. //depot/projects/mips/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/mips/gnu/lib/libdialog/menubox.c#3 integrate .. //depot/projects/mips/gnu/lib/libregex/AUTHORS#2 delete .. //depot/projects/mips/gnu/lib/libregex/COPYING#2 delete .. //depot/projects/mips/gnu/lib/libregex/ChangeLog#2 delete .. //depot/projects/mips/gnu/lib/libregex/FREEBSD-upgrade#1 branch .. //depot/projects/mips/gnu/lib/libregex/INSTALL#2 delete .. //depot/projects/mips/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/mips/gnu/lib/libregex/Makefile.gnu#2 delete .. //depot/projects/mips/gnu/lib/libregex/Makefile.in#2 delete .. //depot/projects/mips/gnu/lib/libregex/NEWS#2 delete .. //depot/projects/mips/gnu/lib/libregex/README#2 delete .. //depot/projects/mips/gnu/lib/libregex/VERSION#2 delete .. //depot/projects/mips/gnu/lib/libregex/config.status#2 delete .. //depot/projects/mips/gnu/lib/libregex/configure#2 delete .. //depot/projects/mips/gnu/lib/libregex/configure.in#2 delete .. //depot/projects/mips/gnu/lib/libregex/gnuregex.h#1 branch .. //depot/projects/mips/gnu/lib/libregex/posix/regex.h#1 branch .. //depot/projects/mips/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/mips/gnu/lib/libregex/regex.h#2 integrate .. //depot/projects/mips/gnu/lib/libregex/test/ChangeLog#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/Makefile#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/Makefile.in#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/alloca.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/bsd-interf.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/debugmalloc.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/emacsmalloc.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/fileregex.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/g++malloc.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/getpagesize.h#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/iregex.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/main.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/malloc-test.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/other.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/printchar.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-basic.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-extend.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-generic.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-group.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-interf.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/psx-interv.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/regexcpp.sed#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/syntax.skel#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/test.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/test.h#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/tregress.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/upcase.c#2 delete .. //depot/projects/mips/gnu/lib/libregex/test/xmalloc.c#2 delete .. //depot/projects/mips/gnu/lib/libstdc++/Makefile#7 integrate .. //depot/projects/mips/gnu/usr.bin/bc/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/addr2line/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile.inc#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile.inc0#6 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h#1 branch .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#2 delete .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#5 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libbfd/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libbinutils/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libiberty/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/nm/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/objcopy/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/objdump/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/readelf/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/size/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/strings/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/strip/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/c++/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/c++filt/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc_int/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cccp/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cpp0/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cc/f771/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cc/tradcpp0/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/cvs/cvs/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/cvs/lib/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/cvs/libdiff/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/dc/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/diff/diff.1#2 integrate .. //depot/projects/mips/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/gperf/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/config.hin#2 delete .. //depot/projects/mips/gnu/usr.bin/grep/dfa.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/getopt.c#2 delete .. //depot/projects/mips/gnu/usr.bin/grep/getopt.h#2 delete .. //depot/projects/mips/gnu/usr.bin/grep/getopt1.c#2 delete .. //depot/projects/mips/gnu/usr.bin/grep/search.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/stpcpy.c#2 delete .. //depot/projects/mips/gnu/usr.bin/groff/src/libs/libgroff/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/mips/gnu/usr.bin/gzip/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/gzip/getopt.c#3 delete .. //depot/projects/mips/gnu/usr.bin/gzip/getopt.h#2 delete .. //depot/projects/mips/gnu/usr.bin/man/manpath/manpath.config#5 integrate .. //depot/projects/mips/gnu/usr.bin/patch/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/patch/getopt.c#2 delete .. //depot/projects/mips/gnu/usr.bin/patch/getopt.h#2 delete .. //depot/projects/mips/gnu/usr.bin/patch/getopt1.c#2 delete .. //depot/projects/mips/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/tar/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/texinfo/libtxi/Makefile#2 integrate .. //depot/projects/mips/include/Makefile#19 integrate .. //depot/projects/mips/include/getopt.h#2 integrate .. //depot/projects/mips/include/netdb.h#4 integrate .. //depot/projects/mips/include/protocols/routed.h#2 integrate .. //depot/projects/mips/include/resolv.h#4 integrate .. //depot/projects/mips/include/stdlib.h#7 integrate .. //depot/projects/mips/include/unistd.h#8 integrate .. //depot/projects/mips/kerberos5/Makefile#6 integrate .. //depot/projects/mips/kerberos5/Makefile.inc#6 integrate .. //depot/projects/mips/kerberos5/include/Makefile#3 delete .. //depot/projects/mips/kerberos5/lib/Makefile#4 integrate .. //depot/projects/mips/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/mips/kerberos5/lib/libgssapi/Makefile#3 integrate .. //depot/projects/mips/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/mips/kerberos5/lib/libkadm5clnt/Makefile#3 integrate .. //depot/projects/mips/kerberos5/lib/libkadm5srv/Makefile#3 integrate .. //depot/projects/mips/kerberos5/lib/libkafs5/Makefile#5 integrate .. //depot/projects/mips/kerberos5/lib/libkrb5/Makefile#4 integrate .. //depot/projects/mips/kerberos5/lib/libroken/Makefile#3 integrate .. //depot/projects/mips/kerberos5/lib/libsl/Makefile#3 integrate .. //depot/projects/mips/kerberos5/lib/libvers/Makefile#3 integrate .. //depot/projects/mips/kerberos5/libexec/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/Makefile.inc#2 integrate .. //depot/projects/mips/kerberos5/libexec/hprop/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/hpropd/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/ipropd-master/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/ipropd-slave/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/kadmind/Makefile#3 integrate .. //depot/projects/mips/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/mips/kerberos5/libexec/kpasswdd/Makefile#3 integrate .. //depot/projects/mips/kerberos5/tools/Makefile#1 branch .. //depot/projects/mips/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/mips/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/mips/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/mips/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/mips/kerberos5/usr.bin/Makefile#4 integrate .. //depot/projects/mips/kerberos5/usr.bin/kadmin/Makefile#4 integrate .. //depot/projects/mips/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.bin/krb5-config/Makefile#5 integrate .. //depot/projects/mips/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.bin/verify_krb5_conf/Makefile#2 integrate .. //depot/projects/mips/kerberos5/usr.sbin/kstash/Makefile#3 integrate .. //depot/projects/mips/kerberos5/usr.sbin/ktutil/Makefile#5 integrate .. //depot/projects/mips/lib/Makefile#11 integrate .. //depot/projects/mips/lib/libarchive/Makefile#1 branch .. //depot/projects/mips/lib/libarchive/README#1 branch .. //depot/projects/mips/lib/libarchive/archive.h#1 branch .. //depot/projects/mips/lib/libarchive/archive_check_magic.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_entry.3#1 branch .. //depot/projects/mips/lib/libarchive/archive_entry.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_entry.h#1 branch .. //depot/projects/mips/lib/libarchive/archive_private.h#1 branch .. //depot/projects/mips/lib/libarchive/archive_read.3#1 branch .. //depot/projects/mips/lib/libarchive/archive_read.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_data_into_buffer.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_data_into_fd.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_extract.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_open_file.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_all.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_bzip2.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_gzip.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_none.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_format_all.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_format_cpio.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_format_gnutar.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_string.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_string.h#1 branch .. //depot/projects/mips/lib/libarchive/archive_string_sprintf.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_util.3#1 branch .. //depot/projects/mips/lib/libarchive/archive_util.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write.3#1 branch .. //depot/projects/mips/lib/libarchive/archive_write.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_open_file.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_bzip2.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_gzip.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_none.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format_by_name.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format_cpio.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format_pax.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format_shar.c#1 branch .. //depot/projects/mips/lib/libarchive/archive_write_set_format_ustar.c#1 branch .. //depot/projects/mips/lib/libarchive/libarchive.3#1 branch .. //depot/projects/mips/lib/libarchive/tar.5#1 branch .. //depot/projects/mips/lib/libatm/Makefile#5 integrate .. //depot/projects/mips/lib/libatm/ioctl_subr.c#3 integrate .. //depot/projects/mips/lib/libatm/ip_addr.c#4 integrate .. //depot/projects/mips/lib/libc/alpha/gen/isinf.c#3 integrate .. //depot/projects/mips/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/mips/lib/libc/amd64/gen/fabs.S#3 integrate .. //depot/projects/mips/lib/libc/amd64/gen/isinf.c#2 integrate .. //depot/projects/mips/lib/libc/amd64/gen/ldexp.c#3 integrate .. //depot/projects/mips/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/mips/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/mips/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/mips/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/mips/lib/libc/gen/sem.c#2 integrate .. //depot/projects/mips/lib/libc/gen/signal.3#4 integrate .. //depot/projects/mips/lib/libc/i386/gen/isinf.c#3 integrate .. //depot/projects/mips/lib/libc/i386/gen/ldexp.c#3 integrate .. //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#4 integrate .. //depot/projects/mips/lib/libc/ia64/gen/isinf.c#3 integrate .. //depot/projects/mips/lib/libc/ia64/string/bcopy.S#3 integrate .. //depot/projects/mips/lib/libc/ia64/string/bzero.S#3 integrate .. //depot/projects/mips/lib/libc/include/reentrant.h#3 integrate .. //depot/projects/mips/lib/libc/locale/setlocale.3#6 integrate .. //depot/projects/mips/lib/libc/locale/setlocale.c#5 integrate .. //depot/projects/mips/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/mips/lib/libc/net/getaddrinfo.3#4 integrate .. //depot/projects/mips/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/mips/lib/libc/net/gethostbydns.c#4 integrate .. //depot/projects/mips/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/mips/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/mips/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/mips/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/mips/lib/libc/net/herror.c#2 integrate .. //depot/projects/mips/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/mips/lib/libc/net/name6.c#7 integrate .. //depot/projects/mips/lib/libc/net/res_init.c#3 integrate .. //depot/projects/mips/lib/libc/net/res_send.c#3 integrate .. //depot/projects/mips/lib/libc/net/res_send_private.h#1 branch .. //depot/projects/mips/lib/libc/net/resolver.3#4 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/fabs.S#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/flt_rounds.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpgetmask.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpgetround.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpgetsticky.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpsetmask.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpsetround.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/fpsetsticky.c#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/isinf.c#3 integrate .. //depot/projects/mips/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/mips/lib/libc/sparc64/gen/fabs.S#2 integrate .. //depot/projects/mips/lib/libc/sparc64/gen/isinf.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/mktemp.3#3 integrate .. //depot/projects/mips/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/mips/lib/libc/stdio/vfwscanf.c#6 integrate .. //depot/projects/mips/lib/libc/stdlib/Makefile.inc#9 integrate .. //depot/projects/mips/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt_long.3#3 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt_long.c#3 integrate .. //depot/projects/mips/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/mips/lib/libc/stdlib/getsubopt.c#3 integrate .. //depot/projects/mips/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/mips/lib/libc/sys/poll.2#4 integrate .. //depot/projects/mips/lib/libc/sys/select.2#5 integrate .. //depot/projects/mips/lib/libc/sys/sendfile.2#7 integrate .. //depot/projects/mips/lib/libc/sys/setpgid.2#3 integrate .. //depot/projects/mips/lib/libc_r/Makefile#4 integrate .. //depot/projects/mips/lib/libc_r/arch/ia64/_atomic_lock.S#3 integrate .. //depot/projects/mips/lib/libcam/Makefile#3 integrate .. //depot/projects/mips/lib/libdevstat/Makefile#4 integrate .. //depot/projects/mips/lib/libdisk/Makefile#6 integrate .. //depot/projects/mips/lib/libdisk/change.c#5 integrate .. //depot/projects/mips/lib/libdisk/write_ia64_disk.c#8 integrate .. //depot/projects/mips/lib/libfetch/http.c#8 integrate .. //depot/projects/mips/lib/libipsec/ipsec_dump_policy.c#3 integrate .. //depot/projects/mips/lib/libipsec/pfkey.c#3 integrate .. //depot/projects/mips/lib/libipsec/pfkey_dump.c#4 integrate .. //depot/projects/mips/lib/libipsec/policy_token.l#3 integrate .. //depot/projects/mips/lib/libkvm/kvm_getprocs.3#5 integrate .. //depot/projects/mips/lib/libkvm/kvm_proc.c#8 integrate .. //depot/projects/mips/lib/libmd/Makefile#3 integrate .. //depot/projects/mips/lib/libnetgraph/Makefile#2 integrate .. //depot/projects/mips/lib/libnetgraph/msg.c#3 integrate .. //depot/projects/mips/lib/libnetgraph/netgraph.3#5 integrate .. //depot/projects/mips/lib/libnetgraph/netgraph.h#2 integrate .. //depot/projects/mips/lib/libnetgraph/sock.c#4 integrate .. //depot/projects/mips/lib/libngatm/Makefile#2 integrate .. //depot/projects/mips/lib/libopie/Makefile#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_krb5/Makefile#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_krb5/pam_krb5.c#8 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ksu/Makefile#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ksu/pam_ksu.c#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate .. //depot/projects/mips/lib/libpam/modules/pam_login_access/pam_login_access.c#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#6 integrate .. //depot/projects/mips/lib/libpam/modules/pam_securetty/pam_securetty.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ssh/pam_ssh.c#5 integrate .. //depot/projects/mips/lib/libpam/modules/pam_unix/pam_unix.c#6 integrate .. //depot/projects/mips/lib/libpthread/Makefile#5 integrate .. //depot/projects/mips/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 integrate .. //depot/projects/mips/lib/libpthread/pthread.map#4 integrate .. //depot/projects/mips/lib/libpthread/test/Makefile#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_printf.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#11 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sem.c#4 integrate .. //depot/projects/mips/lib/libpthread_dbg/Makefile#1 branch .. //depot/projects/mips/lib/libpthread_dbg/arch/i386/Makefile.inc#1 branch .. //depot/projects/mips/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#1 branch .. //depot/projects/mips/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#1 branch .. //depot/projects/mips/lib/libpthread_dbg/pthread_dbg.c#1 branch .. //depot/projects/mips/lib/libpthread_dbg/pthread_dbg.h#1 branch .. //depot/projects/mips/lib/libpthread_dbg/pthread_dbg_int.h#1 branch .. //depot/projects/mips/lib/libradius/Makefile#2 integrate .. //depot/projects/mips/lib/libsdp/search.c#4 integrate .. //depot/projects/mips/lib/libstand/zalloc_defs.h#5 integrate .. //depot/projects/mips/lib/libstand/zalloc_malloc.c#3 integrate .. //depot/projects/mips/lib/libtacplus/Makefile#2 integrate .. //depot/projects/mips/lib/libthr/arch/i386/i386/_setcurthread.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_barrier.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_barrierattr.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_cancel.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_create.c#7 integrate .. //depot/projects/mips/lib/libthr/thread/thr_getschedparam.c#2 delete .. //depot/projects/mips/lib/libthr/thread/thr_init.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/thr_kern.c#7 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#7 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_printf.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/mips/lib/libthr/thread/thr_rwlock.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_setschedparam.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_sig.c#4 integrate .. //depot/projects/mips/lib/libugidfw/Makefile#3 integrate .. //depot/projects/mips/lib/libugidfw/bsde_get_rule.3#3 integrate .. //depot/projects/mips/lib/libugidfw/libugidfw.3#3 integrate .. //depot/projects/mips/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/mips/lib/libugidfw/ugidfw.h#3 integrate .. //depot/projects/mips/lib/libusbhid/parse.c#4 integrate .. //depot/projects/mips/lib/libusbhid/usbhid.h#2 integrate .. //depot/projects/mips/lib/libutil/Makefile#4 integrate .. //depot/projects/mips/lib/libutil/libutil.h#3 integrate .. //depot/projects/mips/lib/libypclnt/Makefile#3 integrate .. //depot/projects/mips/libexec/bootpd/bootpd.8#2 integrate .. //depot/projects/mips/libexec/bootpd/bootpd.c#4 integrate .. //depot/projects/mips/libexec/ftp-proxy/Makefile#1 branch .. //depot/projects/mips/libexec/ftpd/Makefile#4 integrate .. //depot/projects/mips/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/mips/libexec/lukemftpd/Makefile#7 integrate .. //depot/projects/mips/libexec/makekey/Makefile#2 integrate .. //depot/projects/mips/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/mips/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/mips/libexec/rshd/Makefile#2 integrate .. //depot/projects/mips/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/mips/libexec/ypxfr/ypxfr_misc.c#3 integrate .. //depot/projects/mips/release/Makefile#24 integrate .. //depot/projects/mips/release/Makefile.inc.docports#8 integrate .. //depot/projects/mips/release/alpha/boot_crunch.conf#3 integrate .. //depot/projects/mips/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#16 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/errata/article.sgml#8 integrate .. //depot/projects/mips/release/i386/boot_crunch.conf#4 integrate .. //depot/projects/mips/release/i386/dokern.sh#12 delete .. //depot/projects/mips/release/i386/drivers.conf#16 delete .. //depot/projects/mips/release/i386/fixit_crunch.conf#6 integrate .. //depot/projects/mips/release/ia64/boot_crunch.conf#6 integrate .. //depot/projects/mips/release/pc98/boot_crunch.conf#5 integrate .. //depot/projects/mips/release/pc98/dokern.sh#14 delete .. //depot/projects/mips/release/pc98/drivers-small.conf#4 delete .. //depot/projects/mips/release/pc98/drivers.conf#10 delete .. //depot/projects/mips/release/pc98/fixit-small_crunch.conf#5 integrate .. //depot/projects/mips/release/pc98/fixit_crunch.conf#6 integrate .. //depot/projects/mips/release/picobsd/tinyware/passwd/pw_copy.c#3 integrate .. //depot/projects/mips/release/scripts/doFS.sh#10 integrate .. //depot/projects/mips/release/scripts/driver-copy2.awk#2 delete .. //depot/projects/mips/release/scripts/driver-desc.awk#2 delete .. //depot/projects/mips/release/scripts/driver-remove.awk#2 delete .. //depot/projects/mips/release/scripts/print-cdrom-packages.sh#11 integrate .. //depot/projects/mips/release/scripts/split-file.sh#1 branch .. //depot/projects/mips/release/sparc64/boot_crunch.conf#4 integrate .. //depot/projects/mips/sbin/Makefile#13 integrate .. //depot/projects/mips/sbin/atm/atm/atm.c#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_fore200.c#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_inet.c#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_print.c#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_set.c#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_show.c#5 integrate .. //depot/projects/mips/sbin/atm/atm/atm_subr.c#3 integrate .. //depot/projects/mips/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/mips/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/mips/sbin/atm/atmconfig/diag.h#2 integrate .. //depot/projects/mips/sbin/atm/fore_dnld/fore_dnld.c#4 integrate .. //depot/projects/mips/sbin/atm/ilmid/ilmid.c#9 integrate .. //depot/projects/mips/sbin/conscontrol/conscontrol.8#2 integrate .. //depot/projects/mips/sbin/conscontrol/conscontrol.c#2 integrate .. //depot/projects/mips/sbin/dhclient/Makefile.inc#5 integrate .. //depot/projects/mips/sbin/disklabel/Makefile#2 delete .. //depot/projects/mips/sbin/disklabel/disklabel.5#4 delete .. //depot/projects/mips/sbin/disklabel/disklabel.8#12 delete .. //depot/projects/mips/sbin/disklabel/disklabel.c#11 delete .. //depot/projects/mips/sbin/disklabel/pathnames.h#2 delete .. //depot/projects/mips/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/mips/sbin/dumpon/Makefile#2 integrate .. //depot/projects/mips/sbin/fdisk/Makefile#3 integrate .. //depot/projects/mips/sbin/fdisk_pc98/Makefile#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass1b.c#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass3.c#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass4.c#3 integrate .. //depot/projects/mips/sbin/fsck_ffs/pass5.c#5 integrate .. //depot/projects/mips/sbin/fsck_ffs/setup.c#7 integrate .. //depot/projects/mips/sbin/fsck_ffs/utilities.c#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/Makefile#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/check.c#4 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/ext.h#4 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/fat.c#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/main.c#3 integrate .. //depot/projects/mips/sbin/fsdb/Makefile#3 integrate .. //depot/projects/mips/sbin/fsirand/Makefile#2 integrate .. //depot/projects/mips/sbin/gbde/gbde.c#9 integrate .. //depot/projects/mips/sbin/gbde/test.sh#3 integrate .. //depot/projects/mips/sbin/gconcat/Makefile#1 branch .. //depot/projects/mips/sbin/gconcat/gconcat.8#1 branch .. //depot/projects/mips/sbin/gconcat/gconcat.c#1 branch .. //depot/projects/mips/sbin/gpt/Makefile#5 integrate .. //depot/projects/mips/sbin/idmapd/Makefile#2 integrate .. //depot/projects/mips/sbin/idmapd/idmapd.c#2 integrate .. //depot/projects/mips/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/mips/sbin/init/Makefile#3 integrate .. //depot/projects/mips/sbin/init/init.8#6 integrate .. //depot/projects/mips/sbin/ip6fw/Makefile#2 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.8#6 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.c#4 integrate .. //depot/projects/mips/sbin/ipf/Makefile#3 integrate .. //depot/projects/mips/sbin/ipfs/Makefile#2 integrate .. //depot/projects/mips/sbin/ipfstat/Makefile#3 integrate .. //depot/projects/mips/sbin/ipmon/Makefile#4 integrate .. //depot/projects/mips/sbin/ipnat/Makefile#3 integrate .. //depot/projects/mips/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/mips/sbin/mca/Makefile#2 integrate .. //depot/projects/mips/sbin/md5/Makefile#2 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.8#7 integrate .. //depot/projects/mips/sbin/mdmfs/mdmfs.8#7 integrate .. //depot/projects/mips/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/mips/sbin/mknod/Makefile#2 integrate .. //depot/projects/mips/sbin/mksnap_ffs/mksnap_ffs.c#3 integrate .. //depot/projects/mips/sbin/mount/Makefile#3 integrate .. //depot/projects/mips/sbin/mount/mount.8#7 integrate .. //depot/projects/mips/sbin/mount/mount.c#7 integrate .. //depot/projects/mips/sbin/mount_cd9660/Makefile#3 integrate .. //depot/projects/mips/sbin/mount_ext2fs/mount_ext2fs.c#3 integrate .. //depot/projects/mips/sbin/mount_hpfs/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/mips/sbin/mount_nfs4/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_nfs4/mount_nfs4.c#2 integrate .. //depot/projects/mips/sbin/mount_ntfs/Makefile#3 integrate .. //depot/projects/mips/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_std/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_udf/Makefile#3 integrate .. //depot/projects/mips/sbin/mount_umapfs/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/mips/sbin/natd/Makefile#2 integrate .. //depot/projects/mips/sbin/newfs/mkfs.c#12 integrate .. //depot/projects/mips/sbin/newfs/newfs.8#6 integrate .. //depot/projects/mips/sbin/newfs/newfs.c#9 integrate .. //depot/projects/mips/sbin/newfs/newfs.h#6 integrate .. //depot/projects/mips/sbin/newfs_msdos/Makefile#3 integrate .. //depot/projects/mips/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/mips/sbin/nologin/Makefile#3 integrate .. //depot/projects/mips/sbin/nologin/nologin.c#2 integrate .. //depot/projects/mips/sbin/nos-tun/Makefile#2 integrate .. //depot/projects/mips/sbin/pfctl/Makefile#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_cbq.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_classq.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_hfsc.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_priq.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_red.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_rio.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_rmclass.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_var.h#1 branch .. //depot/projects/mips/sbin/pfctl/missing/altq/altq_wfq.h#1 branch .. //depot/projects/mips/sbin/pflogd/Makefile#1 branch .. //depot/projects/mips/sbin/ping/Makefile#3 integrate .. //depot/projects/mips/sbin/ping/ping.c#13 integrate .. //depot/projects/mips/sbin/ping6/Makefile#3 integrate .. //depot/projects/mips/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/mips/sbin/rcorder/Makefile#2 integrate .. //depot/projects/mips/sbin/restore/Makefile#3 integrate .. //depot/projects/mips/sbin/route/Makefile#3 integrate .. //depot/projects/mips/sbin/routed/Makefile#2 integrate .. //depot/projects/mips/sbin/routed/defs.h#3 integrate .. //depot/projects/mips/sbin/routed/if.c#3 integrate .. //depot/projects/mips/sbin/routed/input.c#2 integrate .. //depot/projects/mips/sbin/routed/main.c#3 integrate .. //depot/projects/mips/sbin/routed/output.c#2 integrate .. //depot/projects/mips/sbin/routed/parms.c#2 integrate .. //depot/projects/mips/sbin/routed/pathnames.h#2 integrate .. //depot/projects/mips/sbin/routed/radix.c#2 integrate .. //depot/projects/mips/sbin/routed/rdisc.c#2 integrate .. //depot/projects/mips/sbin/routed/routed.8#2 integrate .. //depot/projects/mips/sbin/routed/rtquery/Makefile#2 integrate .. //depot/projects/mips/sbin/routed/rtquery/rtquery.8#4 integrate .. //depot/projects/mips/sbin/routed/rtquery/rtquery.c#2 integrate .. //depot/projects/mips/sbin/routed/table.c#3 integrate .. //depot/projects/mips/sbin/routed/trace.c#3 integrate .. //depot/projects/mips/sbin/rtsol/Makefile#4 integrate .. //depot/projects/mips/sbin/savecore/Makefile#2 integrate .. //depot/projects/mips/sbin/savecore/savecore.c#4 integrate .. //depot/projects/mips/sbin/slattach/Makefile#2 integrate .. //depot/projects/mips/sbin/startslip/Makefile#2 integrate .. //depot/projects/mips/sbin/sunlabel/Makefile#4 integrate .. //depot/projects/mips/sbin/sunlabel/sunlabel.8#1 branch .. //depot/projects/mips/sbin/sysctl/Makefile#2 integrate .. //depot/projects/mips/sbin/umount/Makefile#3 integrate .. //depot/projects/mips/sbin/vinum/Makefile#3 integrate .. //depot/projects/mips/sbin/vinum/commands.c#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 29 23:25:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C1016A4D0; Sun, 29 Feb 2004 23:25:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DED516A4CE for ; Sun, 29 Feb 2004 23:25:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3146A43D31 for ; Sun, 29 Feb 2004 23:25:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i217PMGe064722 for ; Sun, 29 Feb 2004 23:25:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i217PLPU064711 for perforce@freebsd.org; Sun, 29 Feb 2004 23:25:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 29 Feb 2004 23:25:21 -0800 (PST) Message-Id: <200403010725.i217PLPU064711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 47900 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, 01 Mar 2004 07:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=47900 Change 47900 by jmallett@jmallett_oingo on 2004/02/29 23:25:00 __panic. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#13 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#13 (text+ko) ==== @@ -213,10 +213,12 @@ LEAF(Interrupt) .set noat mfc0 k1, MIPS_COP_0_CAUSE - dla k0, panic + li a0, 0 + li a1, 0 + dla k0, __panic dmtc0 k0, MIPS_COP_0_EXC_PC - dla a0, 1f - move a1, k1 + dla a2, 1f + move a3, k1 eret .set at END(Interrupt) From owner-p4-projects@FreeBSD.ORG Mon Mar 1 00:53:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14DC116A4D0; Mon, 1 Mar 2004 00:53:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E45EF16A4CE for ; Mon, 1 Mar 2004 00:53:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE6A443D3F for ; Mon, 1 Mar 2004 00:53:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i218rCGe089891 for ; Mon, 1 Mar 2004 00:53:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i218rCU9089888 for perforce@freebsd.org; Mon, 1 Mar 2004 00:53:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 1 Mar 2004 00:53:12 -0800 (PST) Message-Id: <200403010853.i218rCU9089888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 47906 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, 01 Mar 2004 08:53:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=47906 Change 47906 by jmallett@jmallett_oingo on 2004/03/01 00:52:59 Do effectively nothing, but stop trying so hard. I have stuff to use a jump table, it neither helps nor hurts. Coming soon. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#14 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#14 (text+ko) ==== @@ -41,45 +41,6 @@ */ LEAF(ExceptionVector) .set noat - /* - * Interrupts are fast. Let everything else go through trap(). - */ - mfc0 k0, MIPS_COP_0_CAUSE - li k1, 31 << 2 - and k0, k1 - beq k0, zero, Interrupt - nop - - /* - * If all the bits were set, it's 31, it's VCED, so go there. - */ - bne k0, k1, 1f - nop - - j VCED - /* No BDSlot, save space by just pulling in the next insn. */ - -1: - /* - * Except stuff the TLB handler really wants. (TLB exceptions - * that are not TLBMod, that goes through trap() and into pmap.) - * This means that if this is one, or has bits outside of the - * three lowest set, we need to go ahead. Otherwise, switch to - * the TLB miss handler. - */ - li k1, 1 << 2 - beq k1, k0, 1f - nop - - li k1, ~(3 << 2) - and k1, k0 - bne k1, zero, 1f - nop - - j XTLBMissVector - nop - -1: dsubu sp, sp, TF_SIZE dla k0, 1f j exception_save_registers @@ -174,8 +135,8 @@ LEAF(XTLBMissVector) .set noat dmfc0 k0, MIPS_COP_0_BAD_VADDR - li k1, MIPS_XKSEG_START - subu k0, k1 + dli k1, MIPS_XKSEG_START + dsubu k0, k1 /* * Shift right logical to get a page index, but leaving * enough bits to index an array of 64 bit values, plus From owner-p4-projects@FreeBSD.ORG Mon Mar 1 11:05:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BBB216A4D0; Mon, 1 Mar 2004 11:05:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BCDB16A4CE for ; Mon, 1 Mar 2004 11:05:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3572D43D2F for ; Mon, 1 Mar 2004 11:05:47 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i21J5lGe039409 for ; Mon, 1 Mar 2004 11:05:47 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i21J5ix5039405 for perforce@freebsd.org; Mon, 1 Mar 2004 11:05:44 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Mon, 1 Mar 2004 11:05:44 -0800 (PST) Message-Id: <200403011905.i21J5ix5039405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 47927 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, 01 Mar 2004 19:05:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=47927 Change 47927 by areisse@areisse_ibook on 2004/03/01 11:05:35 use sudo instead of su Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#28 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#28 (text+ko) ==== @@ -13,6 +13,9 @@ continuing, so that absolute paths and 'make install' targets will be in the right place. + Enabling sshd (under "Remote Login" in "Sharing" control panel) + will help in recovering systems that boot, but can't login graphically. + Step 2: Check out TrustedBSD/SEDarwin source tree In our environment, this requires installing and configuring the @@ -177,11 +180,10 @@ Step 9.15: Install some modified Mach headers. You may want to save the old headers also. - su cp /usr/include/mach/message.h /usr/include/mach/mach_types.defs /tmp - cd apsl/xnu/BUILD/obj/EXPORT_HDRS - cp message.h mach_types.defs /usr/include/mach - exit + cd apsl/xnu/BUILD/obj/EXPORT_HDRS/osfmk/mach + sudo cp message.h mach_types.defs /usr/include/mach + cd ../../../../../../.. Step 9.2: Build modified mach_init BEFORE installing the new init program, save the original because this @@ -200,6 +202,7 @@ chmod u+w bootx.tproj/bootinfo.hdr make sudo cp bootx.bootinfo /System/Library/CoreServices/BootX + cd ../.. Step 10: Build, Install wslogin and WindowServer wrapper @@ -247,6 +250,26 @@ cd apsl/xnu make + + + Install the kernel. There are two choices for how to do this, which + depend on how you want to recover. If you have another working partition + on the same system (or a firewire disk), you can overwrite the default + kernel and not have to change OF settings. Then, to recover, hold down + "option" while rebooting, allowing a choice of boot partitions. The other + method is to change the kernel to boot in OF, while retaining the original + in the default location. + + If you have another working partition: + sudo cp /mach_kernel /mach_kernel.10.2.8 + sudo cp BUILD/obj/RELEASE_PPC/mach_kernel /mach_kernel + sudo chown root:wheel /mach_kernel + sudo chmod 644 /mach_kernel + cd ../.. + + Go to step 13. + + If you want to use OF to select the kernel: sudo cp BUILD/obj/RELEASE_PPC/mach_kernel /mach_kernel.sedarwin sudo chown root:wheel /mach_kernel.sedarwin sudo chmod 644 /mach_kernel.sedarwin @@ -302,7 +325,7 @@ Step 14: Build, Install "file_cmds" - This will build commands like ls with MAC label support. + This will build commands like 'ls' with MAC label support. cd apsl/file_cmds make ; sudo make install @@ -310,7 +333,7 @@ Step 15: Build, Install "adv_cmds" - This will build commands like ps with MAC label support. + This will build commands like 'ps' with MAC label support. cd other/adv_cmds make ; sudo make install @@ -324,7 +347,7 @@ insert the same directory in front of "/.attribute/system/sebsd" to store the attributes in that file system. - mkdir -p /.attribute/system + sudo mkdir -p /.attribute/system sudo extattrctl initattr -p / 256 /.attribute/system/sebsd Step 17: Install mac.conf @@ -354,4 +377,4 @@ If you want to run in enforcing mode, you can use the "kenv_sebsd_enforce" OF variable. Set it with: - # nvram kenv_sebsd_enforce=1 + sudo nvram kenv_sebsd_enforce=1 From owner-p4-projects@FreeBSD.ORG Mon Mar 1 12:06:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB06516A4D0; Mon, 1 Mar 2004 12:06:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C06E16A4CE for ; Mon, 1 Mar 2004 12:06:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76C9C43D45 for ; Mon, 1 Mar 2004 12:06:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i21K62Ge052902 for ; Mon, 1 Mar 2004 12:06:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i21K61NN052897 for perforce@freebsd.org; Mon, 1 Mar 2004 12:06:01 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Mar 2004 12:06:01 -0800 (PST) Message-Id: <200403012006.i21K61NN052897@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 47931 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, 01 Mar 2004 20:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=47931 Change 47931 by rwatson@rwatson_tislabs on 2004/03/01 12:05:04 Explicitly document semantic difference between DROP/ PICKUP_GIANT() and NET_DROP_GIANT() and NET_PICKUP_GIANT(). Affected files ... .. //depot/projects/netperf_socket/sys/sys/mutex.h#2 edit Differences ... ==== //depot/projects/netperf_socket/sys/sys/mutex.h#2 (text+ko) ==== @@ -348,7 +348,10 @@ * the Giant lock. * * This mechanism is intended as temporary until everything of - * importance is properly locked. + * importance is properly locked. Note: the semantics for + * NET_{PICKUP,DROP}_GIANT() are not the same as DROP_GIANT() + * and PICKUP_GIANT(), as they are plain mutex operations + * without a recursion counter. */ extern int debug_mpsafenet; /* defined in net/netisr.c */ #define NET_PICKUP_GIANT() do { \ From owner-p4-projects@FreeBSD.ORG Mon Mar 1 15:56:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD1D416A4F5; Mon, 1 Mar 2004 15:56:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82CA516A4F2 for ; Mon, 1 Mar 2004 15:56:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A33D43D1D for ; Mon, 1 Mar 2004 15:56:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i21NumGe008877 for ; Mon, 1 Mar 2004 15:56:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i21NulmC008874 for perforce@freebsd.org; Mon, 1 Mar 2004 15:56:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Mar 2004 15:56:47 -0800 (PST) Message-Id: <200403012356.i21NulmC008874@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 47943 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, 01 Mar 2004 23:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=47943 Change 47943 by rwatson@rwatson_tislabs on 2004/03/01 15:56:01 Integrate the netperf_socket branch to bring in the changes to the NET_DROP/PICKUP_GIANT() API. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#5 integrate .. //depot/projects/netperf_socket/sys/conf/files#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/acpi_video/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/vlan/Makefile#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_vlan.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_vlan.h#1 branch .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/eventhandler.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mutex.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#3 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.217 2004/02/27 19:30:46 kensmith Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.218 2004/03/01 19:19:15 kensmith Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -585,22 +585,6 @@ } snprintf(cpu_model, sizeof(cpu_model), "%s", platform.model); - /* - * Initalize the real console, so the the bootstrap console is - * no longer necessary. - */ -#ifndef NO_SIO - if (platform.cons_init) { - platform.cons_init(); - promcndetach(); - } -#else - if (platform.cons_init) - platform.cons_init(); - promcndetach(); - cninit(); -#endif - /* NO MORE FIRMWARE ACCESS ALLOWED */ #ifdef _PMAP_MAY_USE_PROM_CONSOLE /* @@ -892,6 +876,24 @@ } /* + * Initalize the real console, so the the bootstrap console is + * no longer necessary. Note this now involves mutexes as part + * of some operations so needs to be after proc0/thread0/curthread + * become valid. + */ +#ifndef NO_SIO + if (platform.cons_init) { + platform.cons_init(); + promcndetach(); + } +#else + if (platform.cons_init) + platform.cons_init(); + promcndetach(); + cninit(); +#endif + + /* * Check to see if promcons needs to make_dev() now, * doing it before now crashes with kernel stack issues. */ ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.74 2004/02/26 03:53:52 mlaier Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.76 2004/03/01 18:42:16 des Exp $ ############################################################## ### Basic configuration options ############################ @@ -116,6 +116,7 @@ cd9660_load="NO" # ISO 9660 filesystem coda_load="NO" # CODA filesystem fdescfs_load="NO" # Filedescriptors filesystem +linprocfs_load="NO" # Linux compatibility process filesystem msdosfs_load="NO" # FAT-12/16/32 nfs_load="NO" # NFS ntfs_load="NO" # NTFS @@ -320,6 +321,7 @@ acpi_dsdt_type="acpi_dsdt" # Don't change this acpi_dsdt_name="/boot/acpi_dsdt.aml" # Override DSDT in BIOS by this file +acpi_video_load="NO" # Load the ACPI video extension driver ############################################################## ### TrustedBSD MAC settings ################################## ==== //depot/projects/netperf_socket/sys/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1202 2004/03/01 02:34:48 ticso Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1203 2004/03/01 07:51:51 bde Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2135,6 +2135,8 @@ # # USB Double Bulk Pipe devices device udbp +# USB Fm Radio +device ufm # Generic USB device driver device ugen # Human Interface Device (anything with buttons and dials) @@ -2155,23 +2157,21 @@ device urio # USB scanners device uscanner +# # USB serial support device ucom +# USB support for Belkin F5U103 and compatible serial adapters +device ubsa +# USB support for BWCT console serial adapters +device ubser # USB support for serial adapters based on the FT8U100AX and FT8U232AM device uftdi # USB support for Prolific PL-2303 serial adapters device uplcom -# USB support for Belkin F5U103 and compatible serial adapters -device ubsa +# USB Visor and Palm devices +device uvisor # USB serial support for DDI pocket's PHS device uvscom -# USB Visor and Palm devices -device uvisor -# USB support for BWCT console serial adapters -device ubser - -# USB Fm Radio -device ufm # # ADMtek USB ethernet. Supports the LinkSys USB100TX, # the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX ==== //depot/projects/netperf_socket/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.870 2004/03/01 02:34:48 ticso Exp $ +# $FreeBSD: src/sys/conf/files,v 1.871 2004/03/01 08:12:55 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -276,6 +276,7 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi +dev/acpica/acpi_video.c optional acpi_video acpi dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.204 2004/02/21 21:10:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.205 2004/03/01 13:17:07 sos Exp $"); #include "opt_ata.h" #include @@ -123,9 +123,6 @@ ch->device[SLAVE].mode = ATA_PIO; ch->dev = dev; ch->state = ATA_IDLE; - bzero(&ch->queue_mtx, sizeof(struct mtx)); - mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0); - TAILQ_INIT(&ch->ata_queue); /* initialise device(s) on this channel */ ch->locking(ch, ATA_LF_LOCK); @@ -159,6 +156,11 @@ if (ch->dma) ch->dma->alloc(ch); + /* initialize queue and associated lock */ + bzero(&ch->queue_mtx, sizeof(struct mtx)); + mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0); + TAILQ_INIT(&ch->ata_queue); + /* do not attach devices if we are in early boot */ if (ata_delayed_attach) return 0; @@ -220,6 +222,7 @@ bus_teardown_intr(dev, ch->r_irq, ch->ih); bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq); ch->r_irq = NULL; + mtx_destroy(&ch->queue_mtx); return 0; } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.170 2004/02/18 21:36:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.171 2004/03/01 13:17:07 sos Exp $"); #include "opt_ata.h" #include @@ -169,6 +169,7 @@ mtx_lock(&adp->queue_mtx); bioq_flush(&adp->queue, NULL, ENXIO); mtx_unlock(&adp->queue_mtx); + mtx_destroy(&adp->queue_mtx); disk_destroy(adp->disk); ata_prtdev(atadev, "WARNING - removed from configuration\n"); ata_free_name(atadev); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.163 2004/02/21 18:30:03 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.164 2004/03/01 13:17:07 sos Exp $"); #include "opt_ata.h" #include @@ -204,6 +204,7 @@ mtx_lock(&cdp->queue_mtx); bioq_flush(&cdp->queue, NULL, ENXIO); mtx_unlock(&cdp->queue_mtx); + mtx_destroy(&cdp->queue_mtx); ata_prtdev(atadev, "WARNING - removed from configuration\n"); ata_free_name(atadev); ata_free_lun(&acd_lun_map, cdp->lun); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.94 2004/02/18 21:36:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.95 2004/03/01 13:17:07 sos Exp $"); #include #include @@ -124,6 +124,7 @@ mtx_lock(&fdp->queue_mtx); bioq_flush(&fdp->queue, NULL, ENXIO); mtx_unlock(&fdp->queue_mtx); + mtx_destroy(&fdp->queue_mtx); disk_destroy(fdp->disk); ata_prtdev(atadev, "WARNING - removed from configuration\n"); ata_free_name(atadev); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.89 2004/02/21 21:10:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.90 2004/03/01 13:17:07 sos Exp $"); #include "opt_ata.h" #include @@ -169,6 +169,7 @@ mtx_lock(&stp->queue_mtx); bioq_flush(&stp->queue, NULL, ENXIO); mtx_unlock(&stp->queue_mtx); + mtx_destroy(&stp->queue_mtx); destroy_dev(stp->dev1); destroy_dev(stp->dev2); devstat_remove_entry(stp->stats); ==== //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#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/dev/mlx/mlx.c,v 1.44 2004/02/22 09:52:46 cperciva Exp $ + * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.46 2004/03/01 21:45:49 scottl Exp $ */ /* @@ -1554,9 +1554,9 @@ if ((mc->mc_complete == NULL) && (mc != NULL)) mlx_releasecmd(mc); /* we got an error, and we allocated a result */ - if ((error != 0) && (mc->mc_data != NULL)) { - free(mc->mc_data, M_DEVBUF); - mc->mc_data = NULL; + if ((error != 0) && (result != NULL)) { + free(result, M_DEVBUF); + result = NULL; } return(result); } ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.2 2004/02/27 15:34:21 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.3 2004/03/01 17:32:48 pjd Exp $"); #include #include @@ -286,7 +286,6 @@ disk->d_consumer->provider->mediasize; if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC) disk->d_end -= disk->d_consumer->provider->sectorsize; - disk->d_length = disk->d_end - disk->d_start; start = disk->d_end; } /* We have sc->sc_disks[sc->sc_ndisks - 1].d_end in 'start'. */ @@ -383,7 +382,6 @@ disk->d_softc = sc; disk->d_start = 0; /* not yet */ disk->d_end = 0; /* not yet */ - disk->d_length = 0; /* not yet */ disk->d_valid = 1; G_CONCAT_DEBUG(0, "Disk %s attached to %s.", pp->name, gp->name); ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.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/geom/concat/g_concat.h,v 1.2 2004/02/27 15:32:49 pjd Exp $ + * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.3 2004/03/01 17:33:11 pjd Exp $ */ #ifndef _G_CONCAT_H_ @@ -63,9 +63,7 @@ struct g_concat_softc *d_softc; off_t d_start; off_t d_end; - off_t d_length; boolean_t d_valid; - LIST_ENTRY(g_concat_path) d_next; }; struct g_concat_softc { ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#3 (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/i386/conf/NOTES,v 1.1125 2004/02/24 04:18:07 bde Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1126 2004/03/01 08:12:55 njl Exp $ # # @@ -445,7 +445,7 @@ # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # -device acpi +device acpi options ACPI_DEBUG options ACPI_MAX_THREADS=1 #!options ACPI_NO_SEMAPHORES @@ -453,7 +453,11 @@ # ACPI Toshiba Extras (LCD backlight/brightness, video output, etc.) # -device acpi_toshiba +device acpi_toshiba + +# ACPI Video Extensions (LCD backlight/brightness, video output, etc.) +# +device acpi_video # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.171 2004/02/27 18:52:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.172 2004/03/01 23:07:58 jhb Exp $"); #include #include @@ -643,7 +643,7 @@ if (ku) { if ((td2 = ku->ku_owner) == NULL) { panic("%s: no owner", __func__); - } else if (TD_ON_SLEEPQ(td2) && + } else if (TD_ON_SLEEPQ(td2) && (td2->td_flags & TDF_SINTR) && ((td2->td_wchan == &kg->kg_completed) || (td2->td_wchan == &p->p_siglist && (ku->ku_mflags & KMF_WAITSIGEVENT)))) { ==== //depot/projects/netperf_socket/sys/modules/acpi/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.37 2004/01/12 19:30:57 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.38 2004/03/01 08:15:26 njl Exp $ -SUBDIR= acpi acpi_toshiba +SUBDIR= acpi acpi_toshiba acpi_video .include ==== //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ -# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.31 2004/01/28 00:42:51 emax Exp $ +# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.32 2004/03/01 17:22:15 ru Exp $ SUBDIR= UI \ async \ @@ -35,7 +35,8 @@ sync_sr \ tee \ tty \ - vjc + vjc \ + vlan .if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c) _mppc= mppc ==== //depot/projects/netperf_socket/sys/netinet/ip_input.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.265 2004/02/28 19:50:43 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.266 2004/03/01 22:37:01 rwatson Exp $ */ #include "opt_bootp.h" ==== //depot/projects/netperf_socket/sys/netinet/tcp_input.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.231 2004/02/28 15:12:20 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.232 2004/03/01 19:10:31 ume Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -459,6 +459,7 @@ tcpstat.tcps_rcvtotal++; if (isipv6) { +#ifdef INET6 /* IP6_EXTHDR_CHECK() is already done at tcp6_input() */ ip6 = mtod(m, struct ip6_hdr *); tlen = sizeof(*ip6) + ntohs(ip6->ip6_plen) - off0; @@ -480,6 +481,9 @@ /* XXX stat */ goto drop; } +#else + th = NULL; /* XXX: avoid compiler warning */ +#endif } else { /* * Get IP and TCP header together in first mbuf. @@ -546,9 +550,11 @@ tlen -= off; /* tlen is used instead of ti->ti_len */ if (off > sizeof (struct tcphdr)) { if (isipv6) { +#ifdef INET6 IP6_EXTHDR_CHECK(m, off0, off, ); ip6 = mtod(m, struct ip6_hdr *); th = (struct tcphdr *)((caddr_t)ip6 + off0); +#endif } else { if (m->m_len < sizeof(struct ip) + off) { if ((m = m_pullup(m, sizeof (struct ip) + off)) @@ -624,12 +630,14 @@ 1, m->m_pkthdr.rcvif); } } else { - if (isipv6) + if (isipv6) { +#ifdef INET6 inp = in6_pcblookup_hash(&tcbinfo, &ip6->ip6_src, th->th_sport, &ip6->ip6_dst, th->th_dport, 1, m->m_pkthdr.rcvif); - else +#endif + } else inp = in_pcblookup_hash(&tcbinfo, ip->ip_src, th->th_sport, ip->ip_dst, th->th_dport, @@ -667,12 +675,14 @@ #endif if (isipv6) { +#ifdef INET6 strcpy(dbuf, "["); strcpy(sbuf, "["); strcat(dbuf, ip6_sprintf(&ip6->ip6_dst)); strcat(sbuf, ip6_sprintf(&ip6->ip6_src)); strcat(dbuf, "]"); strcat(sbuf, "]"); +#endif } else { strcpy(dbuf, inet_ntoa(ip->ip_dst)); strcpy(sbuf, inet_ntoa(ip->ip_src)); ==== //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.68 2004/02/13 14:50:01 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.69 2004/03/01 15:34:29 ume Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /* @@ -244,6 +244,8 @@ u_int32_t rtalert = ~0; int nxt, ours = 0; struct ifnet *deliverifp = NULL; + struct sockaddr_in6 sa6; + u_int32_t srczone, dstzone; #ifdef PFIL_HOOKS struct in6_addr odst; #endif @@ -387,9 +389,14 @@ in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; } - if ((IN6_IS_ADDR_LOOPBACK(&ip6->ip6_src) || - IN6_IS_ADDR_LOOPBACK(&ip6->ip6_dst)) && - (m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0) { + if (IN6_IS_ADDR_MC_INTFACELOCAL(&ip6->ip6_dst) && + !(m->m_flags & M_LOOP)) { + /* + * In this case, the packet should come from the loopback + * interface. However, we cannot just check the if_flags, + * because ip6_mloopback() passes the "actual" interface + * as the outgoing/incoming interface. + */ ip6stat.ip6s_badscope++; in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; @@ -429,7 +436,12 @@ } #endif - /* drop packets if interface ID portion is already filled */ + /* + * Drop packets if the link ID portion is already filled. + * XXX: this is technically not a good behavior. But, we internally + * use the field to disambiguate link-local addresses, so we cannot + * be generous against those a bit strange addresses. + */ if ((m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0) { if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src) && ip6->ip6_src.s6_addr16[1]) { @@ -444,12 +456,42 @@ } } - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) - ip6->ip6_src.s6_addr16[1] - = htons(m->m_pkthdr.rcvif->if_index); - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] - = htons(m->m_pkthdr.rcvif->if_index); + /* + * construct source and destination address structures with + * disambiguating their scope zones (if there is ambiguity). + * XXX: sin6_family and sin6_len will NOT be referred to, but we fill + * in these fields just in case. + */ + if (in6_addr2zoneid(m->m_pkthdr.rcvif, &ip6->ip6_src, &srczone) || + in6_addr2zoneid(m->m_pkthdr.rcvif, &ip6->ip6_dst, &dstzone)) { + /* + * Note that these generic checks cover cases that src or + * dst are the loopback address and the receiving interface + * is not loopback. + */ + ip6stat.ip6s_badscope++; + goto bad; + } + + bzero(&sa6, sizeof(sa6)); + sa6.sin6_family = AF_INET6; + sa6.sin6_len = sizeof(struct sockaddr_in6); + + sa6.sin6_addr = ip6->ip6_src; + sa6.sin6_scope_id = srczone; + if (in6_embedscope(&ip6->ip6_src, &sa6, NULL, NULL)) { + /* XXX: should not happen */ + ip6stat.ip6s_badscope++; + goto bad; + } + + sa6.sin6_addr = ip6->ip6_dst; + sa6.sin6_scope_id = dstzone; + if (in6_embedscope(&ip6->ip6_dst, &sa6, NULL, NULL)) { + /* XXX: should not happen */ + ip6stat.ip6s_badscope++; + goto bad; + } /* * Multicast check ==== //depot/projects/netperf_socket/sys/sys/eventhandler.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/sys/eventhandler.h,v 1.29 2003/03/24 21:24:37 jhb Exp $ + * $FreeBSD: src/sys/sys/eventhandler.h,v 1.30 2004/03/01 22:36:58 phk Exp $ */ #ifndef SYS_EVENTHANDLER_H @@ -89,51 +89,6 @@ EHL_UNLOCK((list)); \ } while (0) - -/* - * Fast handler lists require the eventhandler list be present - * at link time. They don't allow addition of entries to - * unknown eventhandler lists, ie. each list must have an - * "owner". - * - * Fast handler lists must be defined once by the owner - * of the eventhandler list, and the declaration must be in - * scope at any point the list is manipulated. - */ -#define EVENTHANDLER_FAST_DECLARE(name, type) \ -extern struct eventhandler_list Xeventhandler_list_ ## name ; \ -struct eventhandler_entry_ ## name { \ - struct eventhandler_entry ee; \ - type eh_func; \ -}; \ -struct __hack - -#define EVENTHANDLER_FAST_DEFINE(name, type) \ -struct eventhandler_list Xeventhandler_list_ ## name = { #name }; \ -struct __hack - -#define EVENTHANDLER_FAST_INVOKE(name, ...) do { \ - struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ - \ - if (_el->el_flags & EHL_INITTED) { \ - EHL_LOCK(_el); \ - _EVENTHANDLER_INVOKE(name, _el , ## __VA_ARGS__); \ - } \ -} while (0) - -#define EVENTHANDLER_FAST_REGISTER(name, func, arg, priority) \ - eventhandler_register(&Xeventhandler_list_ ## name, \ - #name, func, arg, priority) - -#define EVENTHANDLER_FAST_DEREGISTER(name, tag) do { \ - struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ - \ - KASSERT(_el->el_flags & EHL_INITTED, \ - ("eventhandler_fast_deregister on un-inited list %s", ## name)); \ - EHL_LOCK(_el); \ - eventhandler_deregister(_el, tag); \ -} while (0) - /* * Slow handlers are entirely dynamic; lists are created * when entries are added to them, and thus have no concept of "owner", @@ -196,13 +151,6 @@ EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn); /* after fs sync */ EVENTHANDLER_DECLARE(shutdown_final, shutdown_fn); -/* Idle process event */ -typedef void (*idle_eventhandler_t)(void *, int); - -#define IDLE_PRI_FIRST EVENTHANDLER_PRI_FIRST -#define IDLE_PRI_LAST EVENTHANDLER_PRI_LAST -EVENTHANDLER_FAST_DECLARE(idle_event, idle_eventhandler_t); - /* Low memory event */ typedef void (*vm_lowmem_handler_t)(void *, int); #define LOWMEM_PRI_DEFAULT EVENTHANDLER_PRI_FIRST ==== //depot/projects/netperf_socket/sys/sys/mutex.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/mutex.h,v 1.68 2003/11/05 23:42:50 sam Exp $ + * $FreeBSD: src/sys/sys/mutex.h,v 1.69 2004/03/01 22:37:01 rwatson Exp $ */ #ifndef _SYS_MUTEX_H_ @@ -345,7 +345,9 @@ * input path and protocols that require Giant must collect it * on entry. When 0 Giant is grabbed in the network interface * ISR's and in the netisr path and there is no need to grab - * the Giant lock. + * the Giant lock. Note that, unlike GIANT_PICKUP() and + * GIANT_DROP(), these macros directly wrap mutex operations + * without special recursion handling. * * This mechanism is intended as temporary until everything of * importance is properly locked. Note: the semantics for @@ -354,14 +356,18 @@ * without a recursion counter. */ extern int debug_mpsafenet; /* defined in net/netisr.c */ -#define NET_PICKUP_GIANT() do { \ +#define NET_LOCK_GIANT() do { \ if (debug_mpsafenet) \ mtx_lock(&Giant); \ } while (0) -#define NET_DROP_GIANT() do { \ +#define NET_UNLOCK_GIANT() do { \ if (debug_mpsafenet) \ mtx_unlock(&Giant); \ } while (0) +#define NET_ASSERT_GIANT() do { \ + if (debug_mpsafenet) \ + mtx_assert(&Giant, MA_OWNED); \ +} while (0) #define UGAR(rval) do { \ int _val = (rval); \ From owner-p4-projects@FreeBSD.ORG Mon Mar 1 16:39:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B21F16A4D0; Mon, 1 Mar 2004 16:39:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05F7F16A4CE for ; Mon, 1 Mar 2004 16:39:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 007DC43D31 for ; Mon, 1 Mar 2004 16:39:43 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i220dgGe018247 for ; Mon, 1 Mar 2004 16:39:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i220dgMo018244 for perforce@freebsd.org; Mon, 1 Mar 2004 16:39:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Mar 2004 16:39:42 -0800 (PST) Message-Id: <200403020039.i220dgMo018244@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 47947 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, 02 Mar 2004 00:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=47947 Change 47947 by rwatson@rwatson_tislabs on 2004/03/01 16:39:33 Remove MT_TAG, no longer required. Affected files ... .. //depot/projects/netperf_socket/sys/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/sys/mbuf.h#4 (text+ko) ==== @@ -221,7 +221,6 @@ #if 0 #define MT_RIGHTS 12 /* access rights */ #define MT_IFADDR 13 /* interface address */ -#define MT_TAG 13 /* deprecated: use m_tag's instead */ #endif #define MT_CONTROL 14 /* extra-data protocol message */ #define MT_OOBDATA 15 /* expedited data */ From owner-p4-projects@FreeBSD.ORG Tue Mar 2 08:44:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C230F16A4D0; Tue, 2 Mar 2004 08:44:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C0CD16A4CE for ; Tue, 2 Mar 2004 08:44:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 973CB43D1F for ; Tue, 2 Mar 2004 08:44:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22GiYGe055867 for ; Tue, 2 Mar 2004 08:44:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22GiYso055864 for perforce@freebsd.org; Tue, 2 Mar 2004 08:44:34 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Mar 2004 08:44:34 -0800 (PST) Message-Id: <200403021644.i22GiYso055864@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 47989 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, 02 Mar 2004 16:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=47989 Change 47989 by jhb@jhb_slimer on 2004/03/02 08:44:04 Better version of this over in acpipci. Affected files ... .. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#7 edit Differences ... ==== //depot/projects/smpng/sys/i386/isa/atpic_vector.s#7 (text+ko) ==== @@ -64,12 +64,9 @@ pushl %es ; \ pushl %fs ; \ mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ - data16 ; \ mov %ax,%ds ; \ - data16 ; \ mov %ax,%es ; \ mov $KPSEL,%ax ; \ - data16 ; \ mov %ax,%fs ; \ ; \ FAKE_MCOUNT(13*4(%esp)) ; /* XXX late to avoid double count */ \ From owner-p4-projects@FreeBSD.ORG Tue Mar 2 10:42:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CD3316A4D0; Tue, 2 Mar 2004 10:42:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 172D316A4CE for ; Tue, 2 Mar 2004 10:42:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 118C743D2D for ; Tue, 2 Mar 2004 10:42:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22Ig0Ge088630 for ; Tue, 2 Mar 2004 10:42:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22Ig0wQ088623 for perforce@freebsd.org; Tue, 2 Mar 2004 10:42:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 10:42:00 -0800 (PST) Message-Id: <200403021842.i22Ig0wQ088623@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 47996 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, 02 Mar 2004 18:42:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=47996 Change 47996 by peter@peter_daintree on 2004/03/02 10:41:06 check in some uncommitted changes Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#20 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#31 edit .. //depot/projects/hammer/sys/amd64/include/pcb.h#16 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#20 (text+ko) ==== @@ -42,6 +42,12 @@ #include "assym.s" +#ifdef SMP +#define LK lock ; +#else +#define LK +#endif + /*****************************************************************************/ /* Scheduling */ /*****************************************************************************/ @@ -66,10 +72,7 @@ /* release bit from old pm_active */ movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */ movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */ -#ifdef SMP - lock -#endif - btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ 1: movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx @@ -77,10 +80,7 @@ /* set bit in new pm_active */ movq TD_PROC(%rsi),%rdx movq P_VMSPACE(%rdx), %rdx -#ifdef SMP - lock -#endif - btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ + LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ jmp sw1 /* @@ -92,13 +92,7 @@ * %rsi = newtd */ ENTRY(cpu_switch) - /* Switch to new thread. First, save context. */ -#ifdef INVARIANTS - testq %rdi,%rdi /* no thread? */ - jz badsw2 /* no, panic */ -#endif - movq TD_PCB(%rdi),%r8 movq (%rsp),%rax /* Hardware registers */ @@ -113,6 +107,17 @@ pushfq /* PSL */ popq PCB_RFLAGS(%r8) + testl $PCB_32BIT,PCB_FLAGS(%r8) + jz 1f /* no, skip over */ + + /* Save segment selector numbers */ + movl %ds,PCB_DS(%r8) + movl %es,PCB_ES(%r8) + movl %fs,PCB_FS(%r8) + movl %gs,PCB_GS(%r8) + jmp 2f +1: + /* Save userland %fs */ movl $MSR_FSBASE,%ecx rdmsr @@ -124,13 +129,8 @@ rdmsr movl %eax,PCB_GSBASE(%r8) movl %edx,PCB_GSBASE+4(%r8) +2: - /* Save segment selector numbers */ - movl %ds,PCB_DS(%r8) - movl %es,PCB_ES(%r8) - movl %fs,PCB_FS(%r8) - movl %gs,PCB_GS(%r8) - /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f /* no, skip over */ @@ -164,10 +164,6 @@ 1: /* Save is done. Now fire up new thread. Leave old vmspace. */ -#ifdef INVARIANTS - testq %rsi,%rsi /* no thread? */ - jz badsw3 /* no, panic */ -#endif movq TD_PCB(%rsi),%r8 /* switch address space */ @@ -185,18 +181,12 @@ /* Release bit from old pmap->pm_active */ movq TD_PROC(%rdi), %rdx /* oldproc */ movq P_VMSPACE(%rdx), %rdx -#ifdef SMP - lock -#endif - btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ movq P_VMSPACE(%rdx), %rdx -#ifdef SMP - lock -#endif - btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ + LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ sw1: /* @@ -205,6 +195,9 @@ */ movq TD_PCB(%rsi),%r8 + testl $PCB_32BIT,PCB_FLAGS(%r8) + jz 1f /* no, skip over */ + /* Restore segment selector numbers */ movl PCB_DS(%r8),%ds movl PCB_ES(%r8),%es @@ -215,6 +208,8 @@ rdmsr movl PCB_GS(%r8),%gs wrmsr + jmp 2f +1: /* Restore userland %fs */ movl $MSR_FSBASE,%ecx @@ -227,6 +222,7 @@ movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr +2: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax @@ -272,79 +268,8 @@ orq %rcx,%rax movq %rax,%dr7 1: - ret -#ifdef INVARIANTS -badsw1: - pushq %rax - pushq %rcx - pushq %rdx - pushq %rbx - pushq %rbp - pushq %rsi - pushq %rdi - pushq %r8 - pushq %r9 - pushq %r10 - pushq %r11 - pushq %r12 - pushq %r13 - pushq %r14 - pushq %r15 - movq $0,%rdi - movq $0,%rsi - leaq sw0_1,%rdx - call __panic -sw0_1: .asciz "cpu_throw: no newthread supplied" - -badsw2: - pushq %rax - pushq %rcx - pushq %rdx - pushq %rbx - pushq %rbp - pushq %rsi - pushq %rdi - pushq %r8 - pushq %r9 - pushq %r10 - pushq %r11 - pushq %r12 - pushq %r13 - pushq %r14 - pushq %r15 - movq $0,%rdi - movq $0,%rsi - leaq sw0_2,%rdx - call __panic -sw0_2: .asciz "cpu_switch: no curthread supplied" - -badsw3: - pushq %rax - pushq %rcx - pushq %rdx - pushq %rbx - pushq %rbp - pushq %rsi - pushq %rdi - pushq %r8 - pushq %r9 - pushq %r10 - pushq %r11 - pushq %r12 - pushq %r13 - pushq %r14 - pushq %r15 - movq $0,%rdi - movq $0,%rsi - leaq sw0_3,%rdx - call __panic -sw0_3: .asciz "cpu_switch: no newthread supplied" -#endif - -noswitch: .asciz "cpu_switch: called!" -nothrow: .asciz "cpu_throw: called!" /* * savectx(pcb) * Update pcb, saving current processor state. ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#31 (text+ko) ==== @@ -142,6 +142,7 @@ ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); +ASSYM(PCB_32BIT, PCB_32BIT); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ASSYM(PCB_FULLCTX, PCB_FULLCTX); ==== //depot/projects/hammer/sys/amd64/include/pcb.h#16 (text+ko) ==== @@ -75,6 +75,7 @@ u_long pcb_flags; #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ +#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ #define PCB_FULLCTX 0x80 /* full context restore on sysret */ caddr_t pcb_onfault; /* copyin/out fault recovery */ From owner-p4-projects@FreeBSD.ORG Tue Mar 2 10:49:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AA1716A4D0; Tue, 2 Mar 2004 10:49:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E423C16A4CE for ; Tue, 2 Mar 2004 10:49:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC7B143D1F for ; Tue, 2 Mar 2004 10:49:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22InSGe089159 for ; Tue, 2 Mar 2004 10:49:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22InCUw089155 for perforce@freebsd.org; Tue, 2 Mar 2004 10:49:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 10:49:12 -0800 (PST) Message-Id: <200403021849.i22InCUw089155@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 47997 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, 02 Mar 2004 18:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=47997 Change 47997 by peter@peter_daintree on 2004/03/02 10:48:47 IFC @47996 Affected files ... .. //depot/projects/hammer/MAINTAINERS#15 integrate .. //depot/projects/hammer/Makefile#16 integrate .. //depot/projects/hammer/Makefile.inc1#37 integrate .. //depot/projects/hammer/UPDATING#32 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#3 integrate .. //depot/projects/hammer/bin/csh/Makefile#6 integrate .. //depot/projects/hammer/bin/df/df.c#11 integrate .. //depot/projects/hammer/bin/ls/print.c#9 integrate .. //depot/projects/hammer/bin/ps/Makefile#5 integrate .. //depot/projects/hammer/bin/ps/keyword.c#9 integrate .. //depot/projects/hammer/bin/ps/ps.c#6 integrate .. //depot/projects/hammer/bin/rmail/Makefile#3 integrate .. //depot/projects/hammer/bin/sh/Makefile#5 integrate .. //depot/projects/hammer/bin/sh/jobs.c#9 integrate .. //depot/projects/hammer/bin/sh/trap.c#3 integrate .. //depot/projects/hammer/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/bc/bc/main.c#2 integrate .. //depot/projects/hammer/contrib/bc/h/getopt.h#2 delete .. //depot/projects/hammer/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/hammer/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/hammer/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/cpio/getopt.c#2 delete .. //depot/projects/hammer/contrib/cpio/getopt.h#2 delete .. //depot/projects/hammer/contrib/cpio/getopt1.c#2 delete .. //depot/projects/hammer/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/diff/diff.h#2 integrate .. //depot/projects/hammer/contrib/diff/getopt.c#2 delete .. //depot/projects/hammer/contrib/diff/getopt.h#2 delete .. //depot/projects/hammer/contrib/diff/getopt1.c#2 delete .. //depot/projects/hammer/contrib/gcc/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/gcc/FREEBSD-deletelist#2 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#9 integrate .. //depot/projects/hammer/contrib/gcc/getopt.c#3 delete .. //depot/projects/hammer/contrib/gcc/getopt.h#4 delete .. //depot/projects/hammer/contrib/gcc/getopt1.c#2 delete .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/hammer/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/hammer/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/hammer/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/hammer/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/hammer/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/hammer/contrib/groff/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/getopt.h#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/getopt.c#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/getopt1.c#3 delete .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/hammer/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/hammer/contrib/one-true-awk/lex.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/main.c#5 integrate .. //depot/projects/hammer/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/hammer/contrib/openpam/CREDITS#6 integrate .. //depot/projects/hammer/contrib/openpam/HISTORY#7 integrate .. //depot/projects/hammer/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openpam/RELNOTES#7 integrate .. //depot/projects/hammer/contrib/openpam/configure#2 integrate .. //depot/projects/hammer/contrib/openpam/configure.in#2 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_conv.3#4 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#7 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam.h#5 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_borrow_cred.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_restore_cred.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_authtok.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_data.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_user.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_vprompt.c#5 integrate .. //depot/projects/hammer/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/hammer/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/hammer/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/hammer/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/hammer/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/hammer/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/hammer/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/hammer/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/hammer/contrib/pf/man/pf.4#1 branch .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/hammer/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/hammer/contrib/pf/man/pflog.4#1 branch .. //depot/projects/hammer/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/hammer/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#7 integrate .. //depot/projects/hammer/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#6 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#6 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/cfhead.m4#5 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#6 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#6 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/milter.h#3 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/cdefs.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/libmilter.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/signal.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/assert.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/local.h#3 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.8#4 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/alias.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/mime.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/recipient.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.8#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#6 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/hammer/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/hammer/contrib/texinfo/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt.c#3 delete .. //depot/projects/hammer/contrib/texinfo/lib/getopt.h#3 delete .. //depot/projects/hammer/contrib/texinfo/lib/getopt1.c#3 delete .. //depot/projects/hammer/crypto/openssh/CREDITS#4 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#7 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#4 integrate .. //depot/projects/hammer/crypto/openssh/LICENCE#3 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/hammer/crypto/openssh/README#3 integrate .. //depot/projects/hammer/crypto/openssh/README.dns#2 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#1 branch .. //depot/projects/hammer/crypto/openssh/README.privsep#4 integrate .. //depot/projects/hammer/crypto/openssh/README.smartcard#3 integrate .. //depot/projects/hammer/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/hammer/crypto/openssh/TODO#5 integrate .. //depot/projects/hammer/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#6 integrate .. //depot/projects/hammer/crypto/openssh/acss.c#1 branch .. //depot/projects/hammer/crypto/openssh/acss.h#1 branch .. //depot/projects/hammer/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-rh-rsa.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/hammer/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#5 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#6 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#6 integrate .. //depot/projects/hammer/crypto/openssh/authfd.h#5 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#5 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.h#3 integrate .. //depot/projects/hammer/crypto/openssh/buffer.c#4 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#6 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#7 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#4 integrate .. //depot/projects/hammer/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/hammer/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/hammer/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/hammer/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#6 integrate .. //depot/projects/hammer/crypto/openssh/cipher.h#2 integrate .. //depot/projects/hammer/crypto/openssh/cleanup.c#1 branch .. //depot/projects/hammer/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/hammer/crypto/openssh/compat.c#5 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#6 integrate .. //depot/projects/hammer/crypto/openssh/compress.c#2 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#4 integrate .. //depot/projects/hammer/crypto/openssh/config.h#5 integrate .. //depot/projects/hammer/crypto/openssh/config.sub#4 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#5 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#5 integrate .. //depot/projects/hammer/crypto/openssh/dh.c#5 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#2 integrate .. //depot/projects/hammer/crypto/openssh/dns.h#2 integrate .. //depot/projects/hammer/crypto/openssh/entropy.c#3 integrate .. //depot/projects/hammer/crypto/openssh/fatal.c#2 integrate .. //depot/projects/hammer/crypto/openssh/fixprogs#2 integrate .. //depot/projects/hammer/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/hammer/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#5 integrate .. //depot/projects/hammer/crypto/openssh/install-sh#2 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/hammer/crypto/openssh/key.c#6 integrate .. //depot/projects/hammer/crypto/openssh/key.h#4 integrate .. //depot/projects/hammer/crypto/openssh/log.c#5 integrate .. //depot/projects/hammer/crypto/openssh/log.h#6 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/hammer/crypto/openssh/mac.c#2 integrate .. //depot/projects/hammer/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/hammer/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#5 integrate .. //depot/projects/hammer/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/hammer/crypto/openssh/moduli#2 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#7 integrate .. //depot/projects/hammer/crypto/openssh/monitor.h#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#4 integrate .. //depot/projects/hammer/crypto/openssh/msg.c#5 integrate .. //depot/projects/hammer/crypto/openssh/msg.h#4 integrate .. //depot/projects/hammer/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/hammer/crypto/openssh/nchan2.ms#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/dirname.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntoa.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcat.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcpy.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strsep.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#6 integrate .. //depot/projects/hammer/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#5 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/Makefile#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/sftp-batch.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/ssh-com.sh#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/rijndael.c#4 integrate .. //depot/projects/hammer/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/hammer/crypto/openssh/scp.1#4 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#6 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#6 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#4 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#6 integrate .. //depot/projects/hammer/crypto/openssh/session.c#8 integrate .. //depot/projects/hammer/crypto/openssh/session.h#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.h#3 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.h#3 integrate .. //depot/projects/hammer/crypto/openssh/sftp-glob.c#3 integrate .. //depot/projects/hammer/crypto/openssh/sftp-glob.h#3 delete .. //depot/projects/hammer/crypto/openssh/sftp-int.c#5 delete .. //depot/projects/hammer/crypto/openssh/sftp-int.h#3 delete .. //depot/projects/hammer/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-dss.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rsa.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh.h#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh_prng_cmds.in#3 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#6 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#7 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#8 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.c#3 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.h#2 integrate .. //depot/projects/hammer/crypto/openssh/uidswap.c#4 integrate .. //depot/projects/hammer/crypto/openssh/uuencode.c#3 integrate .. //depot/projects/hammer/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/hammer/crypto/openssh/version.h#8 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#20 integrate .. //depot/projects/hammer/etc/devd.conf#8 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#1 branch .. //depot/projects/hammer/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/hammer/etc/netstart#4 integrate .. //depot/projects/hammer/etc/pam.d/xdm#4 integrate .. //depot/projects/hammer/etc/periodic/daily/110.clean-tmps#3 integrate .. //depot/projects/hammer/etc/rc#11 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#15 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#8 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#2 integrate .. //depot/projects/hammer/etc/rc.d/gbde#2 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#1 branch .. //depot/projects/hammer/etc/rc.d/ip6fw#4 integrate .. //depot/projects/hammer/etc/rc.d/jail#6 integrate .. //depot/projects/hammer/etc/rc.d/netif#4 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#5 integrate .. //depot/projects/hammer/etc/rc.d/random#4 integrate .. //depot/projects/hammer/etc/rc.d/ttys#5 delete .. //depot/projects/hammer/etc/rc.subr#12 integrate .. //depot/projects/hammer/etc/remote#4 integrate .. //depot/projects/hammer/games/factor/Makefile#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#8 integrate .. //depot/projects/hammer/games/morse/morse.6#3 integrate .. //depot/projects/hammer/games/morse/morse.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/menubox.c#3 integrate .. //depot/projects/hammer/gnu/lib/libregex/AUTHORS#2 delete .. //depot/projects/hammer/gnu/lib/libregex/COPYING#2 delete .. //depot/projects/hammer/gnu/lib/libregex/ChangeLog#2 delete .. //depot/projects/hammer/gnu/lib/libregex/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/gnu/lib/libregex/INSTALL#2 delete .. //depot/projects/hammer/gnu/lib/libregex/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile.gnu#2 delete .. //depot/projects/hammer/gnu/lib/libregex/Makefile.in#2 delete .. //depot/projects/hammer/gnu/lib/libregex/NEWS#2 delete .. //depot/projects/hammer/gnu/lib/libregex/README#2 delete .. //depot/projects/hammer/gnu/lib/libregex/VERSION#2 delete .. //depot/projects/hammer/gnu/lib/libregex/config.status#2 delete .. //depot/projects/hammer/gnu/lib/libregex/configure#2 delete .. //depot/projects/hammer/gnu/lib/libregex/configure.in#2 delete .. //depot/projects/hammer/gnu/lib/libregex/gnuregex.h#1 branch .. //depot/projects/hammer/gnu/lib/libregex/posix/regex.h#1 branch .. //depot/projects/hammer/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.h#2 integrate .. //depot/projects/hammer/gnu/lib/libregex/test/ChangeLog#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/Makefile#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/Makefile.in#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/alloca.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/bsd-interf.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/debugmalloc.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/emacsmalloc.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/fileregex.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/g++malloc.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/getpagesize.h#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/iregex.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/main.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/malloc-test.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/other.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/printchar.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-basic.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-extend.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-generic.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-group.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-interf.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/psx-interv.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/regexcpp.sed#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/syntax.skel#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/test.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/test.h#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/tregress.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/upcase.c#2 delete .. //depot/projects/hammer/gnu/lib/libregex/test/xmalloc.c#2 delete .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#16 integrate .. //depot/projects/hammer/gnu/usr.bin/bc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/addr2line/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile.inc0#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/nm/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/objcopy/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/objdump/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/readelf/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/size/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/strings/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/strip/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#14 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cccp/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cpp0/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/tradcpp0/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/dc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/diff.1#3 integrate .. //depot/projects/hammer/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gperf/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/ChangeLog#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/NEWS#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/THANKS#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/config.hin#2 delete .. //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/doc/grep.texi#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/doc/version.texi#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/getopt.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/grep/getopt.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/grep/getopt1.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/grep/getpagesize.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.1#5 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grepmat.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/grep/kwset.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/savedir.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/stpcpy.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/grep/system.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/getopt.c#3 delete .. //depot/projects/hammer/gnu/usr.bin/gzip/getopt.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/manpath/manpath.config#6 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/getopt.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/patch/getopt.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/patch/getopt1.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/libtxi/Makefile#2 integrate .. //depot/projects/hammer/include/Makefile#20 integrate .. //depot/projects/hammer/include/getopt.h#2 integrate .. //depot/projects/hammer/include/netdb.h#5 integrate .. //depot/projects/hammer/include/protocols/routed.h#2 integrate .. //depot/projects/hammer/include/resolv.h#4 integrate .. //depot/projects/hammer/include/stdlib.h#10 integrate .. //depot/projects/hammer/include/unistd.h#12 integrate .. //depot/projects/hammer/kerberos5/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#9 integrate .. //depot/projects/hammer/kerberos5/include/Makefile#3 delete .. //depot/projects/hammer/kerberos5/lib/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#9 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5clnt/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5srv/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libkafs5/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/lib/libkrb5/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/lib/libroken/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/lib/libsl/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libvers/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/libexec/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/Makefile.inc#2 integrate .. //depot/projects/hammer/kerberos5/libexec/hprop/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/hpropd/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/libexec/kadmind/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/kdc/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/libexec/kpasswdd/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/tools/Makefile#1 branch .. //depot/projects/hammer/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/hammer/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/hammer/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/hammer/kerberos5/usr.bin/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kdestroy/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kinit/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/klist/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kpasswd/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#8 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/verify_krb5_conf/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/usr.sbin/kstash/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#6 integrate .. //depot/projects/hammer/lib/Makefile#30 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#1 branch .. //depot/projects/hammer/lib/libarchive/README#1 branch .. //depot/projects/hammer/lib/libarchive/archive.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_entry.3#1 branch .. //depot/projects/hammer/lib/libarchive/archive_entry.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_entry.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_private.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read.3#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_gnutar.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_string.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_string.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_util.3#1 branch .. //depot/projects/hammer/lib/libarchive/archive_util.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write.3#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#1 branch .. //depot/projects/hammer/lib/libarchive/libarchive.3#1 branch .. //depot/projects/hammer/lib/libarchive/tar.5#1 branch .. //depot/projects/hammer/lib/libatm/Makefile#5 integrate .. //depot/projects/hammer/lib/libatm/ioctl_subr.c#5 integrate .. //depot/projects/hammer/lib/libatm/ip_addr.c#5 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/isinf.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/SYS.h#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#5 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#7 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#7 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#5 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#7 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/sem.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#4 integrate .. //depot/projects/hammer/lib/libc/i386/gen/isinf.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/ldexp.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#5 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/isinf.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/string/bcopy.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/string/bzero.S#3 integrate .. //depot/projects/hammer/lib/libc/include/reentrant.h#3 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#6 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#12 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#7 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/hammer/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#4 integrate .. //depot/projects/hammer/lib/libc/net/herror.c#2 integrate .. //depot/projects/hammer/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#8 integrate .. //depot/projects/hammer/lib/libc/net/res_init.c#4 integrate .. //depot/projects/hammer/lib/libc/net/res_send.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_send_private.h#1 branch .. //depot/projects/hammer/lib/libc/net/resolver.3#4 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/_ctx_start.S#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fabs.S#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/flt_rounds.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetmask.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetround.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetmask.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetround.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/isinf.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/makecontext.c#1 branch .. //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/fabs.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/isinf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/mktemp.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#9 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/getsubopt.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/setpgid.2#3 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#7 integrate .. //depot/projects/hammer/lib/libc_r/arch/ia64/_atomic_lock.S#3 integrate .. //depot/projects/hammer/lib/libcam/Makefile#4 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#6 integrate .. //depot/projects/hammer/lib/libdisk/Makefile#6 integrate .. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#10 integrate .. //depot/projects/hammer/lib/libfetch/http.c#7 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_dump_policy.c#3 integrate .. //depot/projects/hammer/lib/libipsec/pfkey.c#3 integrate .. //depot/projects/hammer/lib/libipsec/pfkey_dump.c#5 integrate .. //depot/projects/hammer/lib/libipsec/policy_token.l#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#5 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#15 integrate .. //depot/projects/hammer/lib/libmd/Makefile#4 integrate .. //depot/projects/hammer/lib/libngatm/Makefile#4 integrate .. //depot/projects/hammer/lib/libopie/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#6 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ksu/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ksu/pam_ksu.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_login_access/pam_login_access.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#5 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_securetty/pam_securetty.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ssh/pam_ssh.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#7 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#14 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#8 integrate .. //depot/projects/hammer/lib/libpthread/test/Makefile#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_printf.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#24 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#4 integrate .. //depot/projects/hammer/lib/libpthread_dbg/Makefile#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.c#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.h#1 branch .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg_int.h#1 branch .. //depot/projects/hammer/lib/libradius/Makefile#3 integrate .. //depot/projects/hammer/lib/libsdp/search.c#3 integrate .. //depot/projects/hammer/lib/libstand/zalloc_defs.h#3 integrate .. //depot/projects/hammer/lib/libstand/zalloc_malloc.c#3 integrate .. //depot/projects/hammer/lib/libtacplus/Makefile#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#10 integrate .. //depot/projects/hammer/lib/libthr/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/powerpc/powerpc/_curthread.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_barrierattr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#2 delete .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#6 integrate .. //depot/projects/hammer/lib/libugidfw/Makefile#4 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_get_rule.3#3 integrate .. //depot/projects/hammer/lib/libugidfw/libugidfw.3#3 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#5 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.h#4 integrate .. //depot/projects/hammer/lib/libusbhid/parse.c#5 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/hammer/lib/libutil/Makefile#6 integrate .. //depot/projects/hammer/lib/libutil/libutil.h#3 integrate .. //depot/projects/hammer/lib/libypclnt/Makefile#4 integrate .. //depot/projects/hammer/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/hammer/libexec/bootpd/bootpd.c#4 integrate .. //depot/projects/hammer/libexec/ftp-proxy/Makefile#1 branch .. //depot/projects/hammer/libexec/ftpd/Makefile#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#8 integrate .. //depot/projects/hammer/libexec/makekey/Makefile#2 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/hammer/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/hammer/libexec/rshd/Makefile#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#15 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_misc.c#3 integrate .. //depot/projects/hammer/release/Makefile#45 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#46 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#56 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#11 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#6 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#5 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#6 integrate .. //depot/projects/hammer/release/picobsd/tinyware/passwd/pw_copy.c#3 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#16 integrate .. //depot/projects/hammer/sbin/Makefile#22 integrate .. //depot/projects/hammer/sbin/atm/atm/atm.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_fore200.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_inet.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_print.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_set.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_show.c#5 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_subr.c#3 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#5 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#10 integrate .. //depot/projects/hammer/sbin/conscontrol/conscontrol.8#2 integrate .. //depot/projects/hammer/sbin/conscontrol/conscontrol.c#2 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile.inc#5 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#5 integrate .. //depot/projects/hammer/sbin/dumpon/Makefile#2 integrate .. //depot/projects/hammer/sbin/fdisk/Makefile#3 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/Makefile#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/Makefile#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1b.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass3.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass4.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/utilities.c#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/check.c#5 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#5 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/fat.c#4 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/main.c#4 integrate .. //depot/projects/hammer/sbin/fsdb/Makefile#4 integrate .. //depot/projects/hammer/sbin/fsirand/Makefile#2 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#9 integrate .. //depot/projects/hammer/sbin/gbde/test.sh#4 integrate .. //depot/projects/hammer/sbin/gconcat/Makefile#1 branch .. //depot/projects/hammer/sbin/gconcat/gconcat.8#1 branch .. //depot/projects/hammer/sbin/gconcat/gconcat.c#1 branch .. //depot/projects/hammer/sbin/gpt/Makefile#4 integrate .. //depot/projects/hammer/sbin/idmapd/Makefile#2 integrate .. //depot/projects/hammer/sbin/idmapd/idmapd.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#13 integrate .. //depot/projects/hammer/sbin/init/Makefile#3 integrate .. //depot/projects/hammer/sbin/init/init.8#7 integrate .. //depot/projects/hammer/sbin/ip6fw/Makefile#2 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.8#6 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#7 integrate .. //depot/projects/hammer/sbin/ipf/Makefile#3 integrate .. //depot/projects/hammer/sbin/ipfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfstat/Makefile#3 integrate .. //depot/projects/hammer/sbin/ipmon/Makefile#4 integrate .. //depot/projects/hammer/sbin/ipnat/Makefile#3 integrate .. //depot/projects/hammer/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/hammer/sbin/mca/Makefile#2 integrate .. //depot/projects/hammer/sbin/md5/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#11 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#9 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#10 integrate .. //depot/projects/hammer/sbin/mknod/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount/mount.8#8 integrate .. //depot/projects/hammer/sbin/mount/mount.c#12 integrate .. //depot/projects/hammer/sbin/mount_cd9660/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/hammer/sbin/mount_hpfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_nfs4/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.c#3 integrate .. //depot/projects/hammer/sbin/mount_ntfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_std/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_udf/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_umapfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/natd/Makefile#2 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#15 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#8 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#9 integrate .. //depot/projects/hammer/sbin/newfs/newfs.h#5 integrate .. //depot/projects/hammer/sbin/newfs_msdos/Makefile#3 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.c#5 integrate .. //depot/projects/hammer/sbin/nologin/Makefile#3 integrate .. //depot/projects/hammer/sbin/nologin/nologin.c#2 integrate .. //depot/projects/hammer/sbin/nos-tun/Makefile#2 integrate .. //depot/projects/hammer/sbin/pfctl/Makefile#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_cbq.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_classq.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_hfsc.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_priq.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_red.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_rio.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_rmclass.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_var.h#1 branch .. //depot/projects/hammer/sbin/pfctl/missing/altq/altq_wfq.h#1 branch .. //depot/projects/hammer/sbin/pflogd/Makefile#1 branch .. //depot/projects/hammer/sbin/ping/Makefile#3 integrate .. //depot/projects/hammer/sbin/ping/ping.c#13 integrate .. //depot/projects/hammer/sbin/ping6/Makefile#3 integrate .. //depot/projects/hammer/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/hammer/sbin/rcorder/Makefile#2 integrate .. //depot/projects/hammer/sbin/restore/Makefile#3 integrate .. //depot/projects/hammer/sbin/route/Makefile#3 integrate .. //depot/projects/hammer/sbin/routed/Makefile#3 integrate .. //depot/projects/hammer/sbin/routed/defs.h#3 integrate .. //depot/projects/hammer/sbin/routed/if.c#3 integrate .. //depot/projects/hammer/sbin/routed/input.c#2 integrate .. //depot/projects/hammer/sbin/routed/main.c#3 integrate .. //depot/projects/hammer/sbin/routed/output.c#3 integrate .. //depot/projects/hammer/sbin/routed/parms.c#2 integrate .. //depot/projects/hammer/sbin/routed/pathnames.h#2 integrate .. //depot/projects/hammer/sbin/routed/radix.c#2 integrate .. //depot/projects/hammer/sbin/routed/rdisc.c#2 integrate .. //depot/projects/hammer/sbin/routed/routed.8#2 integrate .. //depot/projects/hammer/sbin/routed/rtquery/Makefile#2 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#5 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.c#2 integrate .. //depot/projects/hammer/sbin/routed/table.c#3 integrate .. //depot/projects/hammer/sbin/routed/trace.c#4 integrate .. //depot/projects/hammer/sbin/rtsol/Makefile#4 integrate .. //depot/projects/hammer/sbin/savecore/Makefile#2 integrate .. //depot/projects/hammer/sbin/savecore/savecore.c#5 integrate .. //depot/projects/hammer/sbin/slattach/Makefile#2 integrate .. //depot/projects/hammer/sbin/startslip/Makefile#2 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#8 integrate .. //depot/projects/hammer/sbin/sysctl/Makefile#2 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#10 integrate .. //depot/projects/hammer/sbin/umount/Makefile#3 integrate .. //depot/projects/hammer/sbin/vinum/Makefile#3 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#10 integrate .. //depot/projects/hammer/sbin/vinum/v.c#6 integrate .. //depot/projects/hammer/sbin/vinum/vext.h#4 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#8 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#7 integrate .. //depot/projects/hammer/secure/libexec/sftp-server/Makefile#5 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/sftp/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#8 integrate .. //depot/projects/hammer/share/doc/papers/timecounter/timecounter.ms#3 integrate .. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#6 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#6 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#16 integrate .. //depot/projects/hammer/share/examples/isdn/v21/Makefile#2 integrate .. //depot/projects/hammer/share/examples/libvgl/Makefile#2 integrate .. //depot/projects/hammer/share/examples/scsi_target/Makefile#3 integrate .. //depot/projects/hammer/share/man/man3/Makefile#5 integrate .. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_barrierattr.3#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#34 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#18 integrate .. //depot/projects/hammer/share/man/man4/acpi_thermal.4#2 integrate .. //depot/projects/hammer/share/man/man4/ata.4#8 integrate .. //depot/projects/hammer/share/man/man4/ath.4#11 integrate .. //depot/projects/hammer/share/man/man4/bfe.4#2 integrate .. //depot/projects/hammer/share/man/man4/cue.4#4 integrate .. //depot/projects/hammer/share/man/man4/led.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#14 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_toshiba.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#6 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#7 integrate .. //depot/projects/hammer/share/man/man4/ncv.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 2 10:53:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7B8C16A4D1; Tue, 2 Mar 2004 10:53:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FD2A16A4CE for ; Tue, 2 Mar 2004 10:53:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A8E143D2D for ; Tue, 2 Mar 2004 10:53:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22IrYGe091007 for ; Tue, 2 Mar 2004 10:53:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22IrYdI091004 for perforce@freebsd.org; Tue, 2 Mar 2004 10:53:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 10:53:34 -0800 (PST) Message-Id: <200403021853.i22IrYdI091004@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 47998 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, 02 Mar 2004 18:53:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=47998 Change 47998 by peter@peter_daintree on 2004/03/02 10:52:36 revert to vendor. this hack has zero hope of working. Affected files ... .. //depot/projects/hammer/contrib/binutils/bfd/elf64-x86-64.c#4 edit .. //depot/projects/hammer/sys/conf/kmod.mk#18 edit Differences ... ==== //depot/projects/hammer/contrib/binutils/bfd/elf64-x86-64.c#4 (text+ko) ==== @@ -667,7 +667,7 @@ cannot be used in shared libs. Don't error out for sections we don't care about, such as debug sections or non-constant sections. */ - if (getenv("BINUTILS_BITE_ME_HARDER") == NULL && info->shared + if (info->shared && (sec->flags & SEC_ALLOC) != 0 && (sec->flags & SEC_READONLY) != 0) { ==== //depot/projects/hammer/sys/conf/kmod.mk#18 (text+ko) ==== @@ -126,7 +126,6 @@ .endif ${FULLPROG}: ${KMOD}.kld - env BINUTILS_BITE_ME_HARDER=true \ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld .if !defined(DEBUG_FLAGS) ${OBJCOPY} --strip-debug ${.TARGET} From owner-p4-projects@FreeBSD.ORG Tue Mar 2 11:28:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C68A16A4D1; Tue, 2 Mar 2004 11:28:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 562ED16A4CF for ; Tue, 2 Mar 2004 11:28:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 397F343D2F for ; Tue, 2 Mar 2004 11:28:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JSJGe098517 for ; Tue, 2 Mar 2004 11:28:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JSI8N098514 for perforce@freebsd.org; Tue, 2 Mar 2004 11:28:18 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 11:28:18 -0800 (PST) Message-Id: <200403021928.i22JSI8N098514@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 48002 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, 02 Mar 2004 19:28:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=48002 Change 48002 by peter@peter_daintree on 2004/03/02 11:27:51 set curpcb right away. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#81 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#81 (text+ko) ==== @@ -1162,6 +1162,7 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); /* From owner-p4-projects@FreeBSD.ORG Tue Mar 2 11:29:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42DCC16A4D0; Tue, 2 Mar 2004 11:29:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D41216A4CE for ; Tue, 2 Mar 2004 11:29:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1837C43D2D for ; Tue, 2 Mar 2004 11:29:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JTKGe098599 for ; Tue, 2 Mar 2004 11:29:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JTKVR098596 for perforce@freebsd.org; Tue, 2 Mar 2004 11:29:20 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 11:29:20 -0800 (PST) Message-Id: <200403021929.i22JTKVR098596@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 48003 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, 02 Mar 2004 19:29:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=48003 Change 48003 by peter@peter_daintree on 2004/03/02 11:28:26 IFi386: we dont have to test curpcb != null anymore. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#39 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#39 (text+ko) ==== @@ -371,8 +371,7 @@ frame.tf_rip = (long)doreti_iret_fault; goto out; } - if (PCPU_GET(curpcb) != NULL && - PCPU_GET(curpcb)->pcb_onfault != NULL) { + if (PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; @@ -555,7 +554,6 @@ nogo: if (!usermode) { if (td->td_intr_nesting_level == 0 && - PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; return (0); From owner-p4-projects@FreeBSD.ORG Tue Mar 2 11:30:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 223AF16A4DB; Tue, 2 Mar 2004 11:30:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF99916A4D3 for ; Tue, 2 Mar 2004 11:30:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA90F43D39 for ; Tue, 2 Mar 2004 11:30:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JUMGe098671 for ; Tue, 2 Mar 2004 11:30:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JUMid098668 for perforce@freebsd.org; Tue, 2 Mar 2004 11:30:22 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 11:30:22 -0800 (PST) Message-Id: <200403021930.i22JUMid098668@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 48004 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, 02 Mar 2004 19:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48004 Change 48004 by peter@peter_daintree on 2004/03/02 11:29:20 IFi386: stuck ipi detection Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#33 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#33 (text+ko) ==== @@ -696,8 +696,8 @@ intr_restore(eflags); } +#define BEFORE_SPIN 1000000 #ifdef DETECT_DEADLOCK -#define BEFORE_SPIN 1000000 #define AFTER_SPIN 1000 #endif @@ -728,11 +728,9 @@ destfield = dest; } -#ifdef DETECT_DEADLOCK - /* Check for an earlier stuck IPI. */ + /* Wait for an earlier IPI to finish. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); -#endif lapic_ipi_raw(icrlo, destfield); From owner-p4-projects@FreeBSD.ORG Tue Mar 2 11:34:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1C4616A4D0; Tue, 2 Mar 2004 11:34:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BCCF16A4CE for ; Tue, 2 Mar 2004 11:34:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86A1343D3F for ; Tue, 2 Mar 2004 11:34:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JYSGe000607 for ; Tue, 2 Mar 2004 11:34:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JYSYP000604 for perforce@freebsd.org; Tue, 2 Mar 2004 11:34:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 11:34:28 -0800 (PST) Message-Id: <200403021934.i22JYSYP000604@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 48005 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, 02 Mar 2004 19:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48005 Change 48005 by peter@peter_daintree on 2004/03/02 11:34:07 final parts of integrate -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#56 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#13 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#56 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#13 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Mar 2 11:59:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E3CB16A4D1; Tue, 2 Mar 2004 11:59:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2866816A4CF for ; Tue, 2 Mar 2004 11:59:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2324B43D31 for ; Tue, 2 Mar 2004 11:59:00 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JwxGe005030 for ; Tue, 2 Mar 2004 11:58:59 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JwxKg005027 for perforce@freebsd.org; Tue, 2 Mar 2004 11:58:59 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Tue, 2 Mar 2004 11:58:59 -0800 (PST) Message-Id: <200403021958.i22JwxKg005027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 48008 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, 02 Mar 2004 19:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=48008 Change 48008 by areisse@areisse_ibook on 2004/03/02 11:58:39 tell them to delete the mkext Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#29 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#29 (text+ko) ==== @@ -356,6 +356,12 @@ sudo make install cd .. +Step 17.9: Force kernel extension cache to be rebuilt + + sudo rm /System/Library/Extensions.kextcache /System/Library/Extensions.mkext + + You may need to do this before every reboot. + Step 18: Reboot At this point, you should now have a new Darwin kernel, support libraries, From owner-p4-projects@FreeBSD.ORG Tue Mar 2 13:33:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A48016A4D0; Tue, 2 Mar 2004 13:33:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D463A16A4CE for ; Tue, 2 Mar 2004 13:33:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B595643D41 for ; Tue, 2 Mar 2004 13:33:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22LXuGe032785 for ; Tue, 2 Mar 2004 13:33:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22LXukk032782 for perforce@freebsd.org; Tue, 2 Mar 2004 13:33:56 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 13:33:56 -0800 (PST) Message-Id: <200403022133.i22LXukk032782@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 48012 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, 02 Mar 2004 21:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=48012 Change 48012 by peter@peter_daintree on 2004/03/02 13:33:28 yay! all done here. (ages ago) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/todo#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Mar 2 13:38:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9248816A4D0; Tue, 2 Mar 2004 13:38:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DF8616A4CE for ; Tue, 2 Mar 2004 13:38:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68BF343D2D for ; Tue, 2 Mar 2004 13:38:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22Lc2Ge032936 for ; Tue, 2 Mar 2004 13:38:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22Lc1SX032933 for perforce@freebsd.org; Tue, 2 Mar 2004 13:38:01 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 13:38:01 -0800 (PST) Message-Id: <200403022138.i22Lc1SX032933@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 48013 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, 02 Mar 2004 21:38:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=48013 Change 48013 by peter@peter_daintree on 2004/03/02 13:37:08 No, there will never be a pcvt here. Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#42 edit .. //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#3 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#42 (text+ko) ==== @@ -105,7 +105,6 @@ ${_ofwdump} \ ${_pccard} \ pciconf \ - ${_pcvt/ispcvt} \ ${_pcvt} \ periodic \ pkg_install \ @@ -321,8 +320,4 @@ .endif .endif -.if ${MACHINE_ARCH} != "i386" -_pcvt/ispcvt= pcvt/ispcvt -.endif - .include ==== //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#3 (text+ko) ==== @@ -1,12 +1,6 @@ # $FreeBSD: src/usr.sbin/pcvt/ispcvt/Makefile,v 1.8 2001/03/26 14:41:07 ru Exp $ -.if ${MACHINE_ARCH} == "i386" PROG= ispcvt MAN= ispcvt.8 -.else -NOOBJ= stub only -NOMAN= stub only -LINKS+= /usr/bin/false /usr/sbin/ispcvt -.endif .include From owner-p4-projects@FreeBSD.ORG Tue Mar 2 13:43:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A5516A4D0; Tue, 2 Mar 2004 13:43:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D21EB16A4CE for ; Tue, 2 Mar 2004 13:43:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCF5243D41 for ; Tue, 2 Mar 2004 13:43:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22Lh9Ge034819 for ; Tue, 2 Mar 2004 13:43:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22Lh9bL034816 for perforce@freebsd.org; Tue, 2 Mar 2004 13:43:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 13:43:09 -0800 (PST) Message-Id: <200403022143.i22Lh9bL034816@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 48015 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, 02 Mar 2004 21:43:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48015 Change 48015 by peter@peter_daintree on 2004/03/02 13:42:11 clean up after merge errors Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#22 (text+ko) ==== @@ -42,12 +42,6 @@ #include "assym.s" -#ifdef SMP -#define LK lock ; -#else -#define LK -#endif - /*****************************************************************************/ /* Scheduling */ /*****************************************************************************/ From owner-p4-projects@FreeBSD.ORG Tue Mar 2 13:46:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7E5616A4D0; Tue, 2 Mar 2004 13:46:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E39D16A4CE for ; Tue, 2 Mar 2004 13:46:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60A6A43D1D for ; Tue, 2 Mar 2004 13:46:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22LkEGe035157 for ; Tue, 2 Mar 2004 13:46:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22LkD9E035154 for perforce@freebsd.org; Tue, 2 Mar 2004 13:46:13 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 13:46:13 -0800 (PST) Message-Id: <200403022146.i22LkD9E035154@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 48016 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, 02 Mar 2004 21:46:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=48016 Change 48016 by peter@peter_daintree on 2004/03/02 13:46:04 update todo list. smp is essentially finished. netstat -i no longer coredumps. common compat/i386/freebsd32 stuff broken out and md bits for amd64 and ia64 are in place. Affected files ... .. //depot/projects/hammer/TODO.txt#9 edit Differences ... ==== //depot/projects/hammer/TODO.txt#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/hammer/TODO.txt#8 $ +$P4: //depot/projects/hammer/TODO.txt#9 $ reread the logs etc and check out the "XXX worry about this later" stuff @@ -7,12 +7,13 @@ USER_LDT (however, there is a syscall to set the %fs and %gs base values to arbitary 64 bit addresses). -SMP (acpi MADT table based etc, ignore mptable stuff) -(XXX: almost finished) - kld module support (the elf_machdep.c relocator is wrong, it uses the old value rather than addends like it should. See alpha/sparc64 for clues.) XXX: can't do this without hacking binutils. +XXX: no, its worse than that. Its completely impossible with the current +binutils without writing a whole bunch of bfd code. No way in hell. +Instead, just give in and write a .o file loader, eg: the .kld file that +we use as the final step towards producing the .ko file. finish the missing relocation types in rtld-elf/amd64/reloc.c (easy) @@ -35,11 +36,6 @@ done this, we can look at theirs) (XXX mostly done. need better libm support still) -factor out common compat/freebsd32/* and compat/ia32/* from ia64 and amd64 -trees. freebsd32 should be for running 32 bit binaries on a 64 bit kernel, -while ia32 is for special MD bits. Lots of missing syscalls. -(XXX: lots done. ia64 MD needed. still some missing syscalls) - make ia32 binary support more robust, including things that do important ioctls etc. (XXX: improving. csh etc work now. execve() was the bug) @@ -47,9 +43,6 @@ (XXX: need some ioctl translators and a few syscall translators that take dense structures with different packing) -netstat -i coredumps. Investigate. -Is this a compiler bug or a libkvm or /dev/kmem bug? - ======= DONE ======= ppp(8) (compiler bug, hack in http://people.freebsd.org/~peter/hammer.diff, but gcc-3.3 would be much better) @@ -85,3 +78,14 @@ make release (should be mostly there, with the bootblock patches) revert ppp(8) compiler bug workaround after gcc-3.3 is imported. + +SMP (acpi MADT table based etc, ignore mptable stuff) + +factor out common compat/freebsd32/* and compat/ia32/* from ia64 and amd64 +trees. freebsd32 should be for running 32 bit binaries on a 64 bit kernel, +while ia32 is for special MD bits. Lots of missing syscalls. +(XXX: lots done. ia64 MD needed. still some missing syscalls) + +netstat -i coredumps. Investigate. +Is this a compiler bug or a libkvm or /dev/kmem bug? + From owner-p4-projects@FreeBSD.ORG Tue Mar 2 13:48:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B2CB16A4D0; Tue, 2 Mar 2004 13:48:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76A0416A4CE for ; Tue, 2 Mar 2004 13:48:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 717F143D1D for ; Tue, 2 Mar 2004 13:48:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22LmHGe035234 for ; Tue, 2 Mar 2004 13:48:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22LmHJe035231 for perforce@freebsd.org; Tue, 2 Mar 2004 13:48:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 13:48:17 -0800 (PST) Message-Id: <200403022148.i22LmHJe035231@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 48017 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, 02 Mar 2004 21:48:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=48017 Change 48017 by peter@peter_daintree on 2004/03/02 13:47:36 note two specific sysctls that need translation to enable i386 libc_r binaries to run. Affected files ... .. //depot/projects/hammer/TODO.txt#10 edit Differences ... ==== //depot/projects/hammer/TODO.txt#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/hammer/TODO.txt#9 $ +$P4: //depot/projects/hammer/TODO.txt#10 $ reread the logs etc and check out the "XXX worry about this later" stuff @@ -42,6 +42,8 @@ (XXX: Need USER_LDT for i386 binaries.) (XXX: need some ioctl translators and a few syscall translators that take dense structures with different packing) +(XXX: kern.ps_strings and kern.usrstack are prime examples of the 4/8 byte + long problem). ======= DONE ======= ppp(8) (compiler bug, hack in http://people.freebsd.org/~peter/hammer.diff, From owner-p4-projects@FreeBSD.ORG Tue Mar 2 16:13:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7BE216A4D0; Tue, 2 Mar 2004 16:13:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0F2416A4CE for ; Tue, 2 Mar 2004 16:13:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA0B743D2D for ; Tue, 2 Mar 2004 16:13:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i230DCGe070278 for ; Tue, 2 Mar 2004 16:13:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i230DCAC070272 for perforce@freebsd.org; Tue, 2 Mar 2004 16:13:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Mar 2004 16:13:12 -0800 (PST) Message-Id: <200403030013.i230DCAC070272@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 48019 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, 03 Mar 2004 00:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48019 Change 48019 by rwatson@rwatson_tislabs on 2004/03/02 16:12:45 Integrate netperf_socket from CVS HEAD. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files.i386#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/ctau/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/sr.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/ucontext.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files.i386#3 (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.466 2004/02/18 22:41:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.467 2004/03/02 16:48:19 rik Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -123,6 +123,9 @@ dev/ar/if_ar_pci.c optional ar pci dev/ar/if_ar_isa.c optional ar isa dev/cm/if_cm_isa.c optional cm isa +dev/ctau/ctau.c optional ctau +dev/ctau/ctddk.c optional ctau +dev/ctau/if_ct.c optional ctau dev/cx/csigma.c optional cx dev/cx/cxddk.c optional cx dev/cx/if_cx.c optional cx ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#5 (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/dev/ata/ata-all.h,v 1.75 2004/02/29 09:35:29 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.76 2004/03/02 14:05:11 sos Exp $ */ /* ATA register defines */ @@ -193,6 +193,7 @@ u_int8_t ccb[16]; /* ATAPI command block */ struct atapi_sense sense_data; /* ATAPI request sense data */ u_int8_t sense_key; /* ATAPI request sense key */ + u_int8_t sense_cmd; /* ATAPI saved command */ } atapi; } u; ==== //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.22 2004/02/28 17:47:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.24 2004/03/02 16:16:54 sos Exp $"); #include "opt_ata.h" #include @@ -338,14 +338,15 @@ sizeof(struct atapi_sense), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + request->u.atapi.sense_key = request->error; + request->u.atapi.sense_cmd = request->u.atapi.ccb[0]; bcopy(ccb, request->u.atapi.ccb, 16); - request->u.atapi.sense_key = request->error; request->data = (caddr_t)&request->u.atapi.sense_data; request->bytecount = sizeof(struct atapi_sense); request->transfersize = sizeof(struct atapi_sense); request->timeout = 5; - request->flags = - ATA_R_ATAPI | ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE; + request->flags &= (ATA_R_ATAPI | ATA_R_QUIET); + request->flags |= (ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE); ata_queue_request(request); return; } @@ -385,10 +386,8 @@ request->u.atapi.sense_data.sk_specific, request->u.atapi.sense_data.sk_specific1, request->u.atapi.sense_data.sk_specific2); - printf("status=%b error=%b\n", - request->status, "\20\10BUSY\7READY\6DMA" - "\5DSC\4DRQ\3CORRECTABLE\2INDEX\1ERROR", - (request->error & ATA_E_MASK), + printf("error=%b\n", + (request->u.atapi.sense_key & ATA_E_MASK), "\20\4MEDIA_CHANGE_REQUEST\3ABORTED" "\2NO_MEDIA\1ILLEGAL_LENGTH"); } @@ -466,7 +465,8 @@ static char buffer[20]; if (request->flags & ATA_R_ATAPI) { - switch (request->u.atapi.ccb[0]) { + switch (request->u.atapi.sense_cmd ? + request->u.atapi.sense_cmd : request->u.atapi.ccb[0]) { case 0x00: return ("TEST_UNIT_READY"); case 0x01: return ("REZERO"); case 0x03: return ("REQUEST_SENSE"); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.164 2004/03/01 13:17:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.165 2004/03/02 14:03:43 sos Exp $"); #include "opt_ata.h" #include @@ -92,7 +92,6 @@ static int acd_read_format_caps(struct acd_softc *, struct cdr_format_capacities *); static int acd_format(struct acd_softc *, struct cdr_format_params *); static int acd_test_ready(struct ata_device *); -static int acd_request_sense(struct ata_device *, struct atapi_sense *); /* internal vars */ static u_int32_t acd_lun_map = 0; @@ -476,24 +475,38 @@ acd_geom_access(struct g_provider *pp, int dr, int dw, int de) { struct acd_softc *cdp; + struct ata_request *request; + int8_t ccb[16] = { ATAPI_TEST_UNIT_READY, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; int timeout = 60, track; + cdp = pp->geom->softc; if (cdp->device->flags & ATA_D_DETACHING) return ENXIO; + if (!(request = ata_alloc_request())) + return ENOMEM; + + request->device = cdp->device; + request->driver = cdp; + bcopy(ccb, request->u.atapi.ccb, 16); + request->flags = ATA_R_ATAPI; + request->timeout = 5; + /* wait if drive is not finished loading the medium */ while (timeout--) { - struct atapi_sense sense; - - if (!acd_test_ready(cdp->device)) - break; - acd_request_sense(cdp->device, &sense); - if (sense.sense_key == 2 && sense.asc == 4 && sense.ascq == 1) + ata_queue_request(request); + if (!request->error && + request->u.atapi.sense_data.sense_key == 2 && + request->u.atapi.sense_data.asc == 4 && + request->u.atapi.sense_data.ascq == 1) tsleep(&timeout, PRIBIO, "acdld", hz / 2); else break; } + ata_free_request(request); + if (pp->acr == 0) { if (cdp->changer_info && cdp->slot != cdp->changer_info->current_slot) { acd_select_slot(cdp); @@ -1522,16 +1535,27 @@ { int8_t ccb[16] = { ATAPI_READ_CAPACITY, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - struct atapi_sense sense; + struct ata_request *request; int8_t dummy[8]; - ata_atapicmd(cdp->device, ccb, dummy, sizeof(dummy), ATA_R_READ, 30); - acd_request_sense(cdp->device, &sense); + if (!(request = ata_alloc_request())) + return ENOMEM; - if (sense.sksv) - *finished = ((sense.sk_specific2|(sense.sk_specific1<<8))*100)/65535; + request->device = cdp->device; + request->driver = cdp; + bcopy(ccb, request->u.atapi.ccb, 16); + request->data = dummy; + request->bytecount = sizeof(dummy); + request->transfersize = min(request->bytecount, 65534); + request->flags = ATA_R_ATAPI | ATA_R_READ; + request->timeout = 30; + ata_queue_request(request); + if (!request->error && request->u.atapi.sense_data.sksv) + *finished = ((request->u.atapi.sense_data.sk_specific2 | + (request->u.atapi.sense_data.sk_specific1<<8))*100)/65535; else *finished = 0; + ata_free_request(request); return 0; } @@ -1985,13 +2009,3 @@ return ata_atapicmd(atadev, ccb, NULL, 0, 0, 30); } - -static int -acd_request_sense(struct ata_device *atadev, struct atapi_sense *sense) -{ - int8_t ccb[16] = { ATAPI_REQUEST_SENSE, 0, 0, 0, sizeof(struct atapi_sense), - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - return ata_atapicmd(atadev, ccb, (caddr_t)sense, - sizeof(struct atapi_sense), ATA_R_READ, 30); -} ==== //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.4 2003/11/14 19:00:30 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.6 2004/03/02 05:43:42 julian Exp $"); #include #include @@ -209,10 +209,17 @@ &sc->bfe_parent_tag); /* tag for TX ring */ - error = bus_dma_tag_create(sc->bfe_parent_tag, BFE_TX_LIST_SIZE, - BFE_TX_LIST_SIZE, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, - NULL, NULL, BFE_TX_LIST_SIZE, 1, BUS_SPACE_MAXSIZE_32BIT, - 0, NULL, NULL, &sc->bfe_tx_tag); + error = bus_dma_tag_create(sc->bfe_parent_tag, + BFE_TX_LIST_SIZE, BFE_TX_LIST_SIZE, + BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, + NULL, NULL, + BFE_TX_LIST_SIZE, + 1, + BUS_SPACE_MAXSIZE_32BIT, + 0, + NULL, NULL, + &sc->bfe_tx_tag); if (error) { device_printf(dev, "could not allocate dma tag\n"); @@ -220,10 +227,17 @@ } /* tag for RX ring */ - error = bus_dma_tag_create(sc->bfe_parent_tag, BFE_RX_LIST_SIZE, - BFE_RX_LIST_SIZE, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, - NULL, NULL, BFE_RX_LIST_SIZE, 1, BUS_SPACE_MAXSIZE_32BIT, - 0, NULL, NULL, &sc->bfe_rx_tag); + error = bus_dma_tag_create(sc->bfe_parent_tag, + BFE_RX_LIST_SIZE, BFE_RX_LIST_SIZE, + BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, + NULL, NULL, + BFE_RX_LIST_SIZE, + 1, + BUS_SPACE_MAXSIZE_32BIT, + 0, + NULL, NULL, + &sc->bfe_rx_tag); if (error) { device_printf(dev, "could not allocate dma tag\n"); @@ -231,9 +245,17 @@ } /* tag for mbufs */ - error = bus_dma_tag_create(sc->bfe_parent_tag, ETHER_ALIGN, 0, - BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, - 1, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->bfe_tag); + error = bus_dma_tag_create(sc->bfe_parent_tag, + ETHER_ALIGN, 0, + BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, + NULL, NULL, + MCLBYTES, + 1, + BUS_SPACE_MAXSIZE_32BIT, + 0, + NULL, NULL, + &sc->bfe_tag); if (error) { device_printf(dev, "could not allocate dma tag\n"); @@ -242,7 +264,8 @@ /* pre allocate dmamaps for RX list */ for (i = 0; i < BFE_RX_LIST_CNT; i++) { - error = bus_dmamap_create(sc->bfe_tag, 0, &sc->bfe_rx_ring[i].bfe_map); + error = bus_dmamap_create(sc->bfe_tag, 0, + &sc->bfe_rx_ring[i].bfe_map); if (error) { device_printf(dev, "cannot create DMA map for RX\n"); return(ENOMEM); @@ -251,7 +274,8 @@ /* pre allocate dmamaps for TX list */ for (i = 0; i < BFE_TX_LIST_CNT; i++) { - error = bus_dmamap_create(sc->bfe_tag, 0, &sc->bfe_tx_ring[i].bfe_map); + error = bus_dmamap_create(sc->bfe_tag, 0, + &sc->bfe_tx_ring[i].bfe_map); if (error) { device_printf(dev, "cannot create DMA map for TX\n"); return(ENOMEM); @@ -319,7 +343,7 @@ irq = pci_read_config(dev, BFE_PCI_INTLINE, 4); /* Reset the power state. */ - printf("bfe%d: chip is is in D%d power mode -- setting to D0\n", + printf("bfe%d: chip is is in D%d power mode -- setting to D0\n", sc->bfe_unit, pci_get_powerstate(dev)); pci_set_powerstate(dev, PCI_POWERSTATE_D0); @@ -359,7 +383,8 @@ } if (bfe_dma_alloc(dev)) { - printf("bfe%d: failed to allocate DMA resources\n", sc->bfe_unit); + printf("bfe%d: failed to allocate DMA resources\n", + sc->bfe_unit); bfe_release_resources(sc); error = ENXIO; goto fail; @@ -381,7 +406,8 @@ bfe_get_config(sc); - printf("bfe%d: Ethernet address: %6D\n", unit, sc->arpcom.ac_enaddr, ":"); + printf("bfe%d: Ethernet address: %6D\n", unit, + sc->arpcom.ac_enaddr, ":"); /* Reset the chip and turn on the PHY */ bfe_chip_reset(sc); @@ -497,20 +523,20 @@ static void bfe_tx_ring_free(struct bfe_softc *sc) { - int i; - - for(i = 0; i < BFE_TX_LIST_CNT; i++) { - if(sc->bfe_tx_ring[i].bfe_mbuf != NULL) { - m_freem(sc->bfe_tx_ring[i].bfe_mbuf); - sc->bfe_tx_ring[i].bfe_mbuf = NULL; - bus_dmamap_unload(sc->bfe_tag, - sc->bfe_tx_ring[i].bfe_map); - bus_dmamap_destroy(sc->bfe_tag, - sc->bfe_tx_ring[i].bfe_map); - } - } - bzero(sc->bfe_tx_list, BFE_TX_LIST_SIZE); - bus_dmamap_sync(sc->bfe_tx_tag, sc->bfe_tx_map, BUS_DMASYNC_PREREAD); + int i; + + for(i = 0; i < BFE_TX_LIST_CNT; i++) { + if(sc->bfe_tx_ring[i].bfe_mbuf != NULL) { + m_freem(sc->bfe_tx_ring[i].bfe_mbuf); + sc->bfe_tx_ring[i].bfe_mbuf = NULL; + bus_dmamap_unload(sc->bfe_tag, + sc->bfe_tx_ring[i].bfe_map); + bus_dmamap_destroy(sc->bfe_tag, + sc->bfe_tx_ring[i].bfe_map); + } + } + bzero(sc->bfe_tx_list, BFE_TX_LIST_SIZE); + bus_dmamap_sync(sc->bfe_tx_tag, sc->bfe_tx_map, BUS_DMASYNC_PREREAD); } static void @@ -690,7 +716,7 @@ static void bfe_chip_reset(struct bfe_softc *sc) { - u_int32_t val; + u_int32_t val; BFE_LOCK(sc); @@ -698,7 +724,8 @@ bfe_pci_setup(sc, BFE_INTVEC_ENET0); /* is core up? */ - val = CSR_READ_4(sc, BFE_SBTMSLOW) & (BFE_RESET | BFE_REJECT | BFE_CLOCK); + val = CSR_READ_4(sc, BFE_SBTMSLOW) & + (BFE_RESET | BFE_REJECT | BFE_CLOCK); if (val == BFE_CLOCK) { /* It is, so shut it down */ CSR_WRITE_4(sc, BFE_RCV_LAZY, 0); @@ -707,7 +734,8 @@ CSR_WRITE_4(sc, BFE_DMATX_CTRL, 0); sc->bfe_tx_cnt = sc->bfe_tx_prod = sc->bfe_tx_cons = 0; if (CSR_READ_4(sc, BFE_DMARX_STAT) & BFE_STAT_EMASK) - bfe_wait_bit(sc, BFE_DMARX_STAT, BFE_STAT_SIDLE, 100, 0); + bfe_wait_bit(sc, BFE_DMARX_STAT, BFE_STAT_SIDLE, + 100, 0); CSR_WRITE_4(sc, BFE_DMARX_CTRL, 0); sc->bfe_rx_prod = sc->bfe_rx_cons = 0; } @@ -738,8 +766,8 @@ BFE_LAZY_FC_MASK)); /* - * We don't want lazy interrupts, so just send them at the end of a frame, - * please + * We don't want lazy interrupts, so just send them at + * the end of a frame, please */ BFE_OR(sc, BFE_RCV_LAZY, 0); @@ -751,8 +779,8 @@ CSR_WRITE_4(sc, BFE_TX_WMARK, 56); /* - * Initialise DMA channels - not forgetting dma addresses need to be added - * to BFE_PCI_DMA + * Initialise DMA channels + * - not forgetting dma addresses need to be added to BFE_PCI_DMA */ CSR_WRITE_4(sc, BFE_DMATX_CTRL, BFE_TX_CTRL_ENABLE); CSR_WRITE_4(sc, BFE_DMATX_ADDR, sc->bfe_tx_dma + BFE_PCI_DMA); @@ -774,8 +802,8 @@ return; /* - * Set reject, wait for it set, then wait for the core to stop being busy - * Then set reset and reject and enable the clocks + * Set reject, wait for it set, then wait for the core to stop + * being busy, then set reset and reject and enable the clocks. */ CSR_WRITE_4(sc, BFE_SBTMSLOW, (BFE_REJECT | BFE_CLOCK)); bfe_wait_bit(sc, BFE_SBTMSLOW, BFE_REJECT, 1000, 0); @@ -870,8 +898,8 @@ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - bfe_cam_write(sc, LLADDR((struct sockaddr_dl *)ifma->ifma_addr), - i++); + bfe_cam_write(sc, + LLADDR((struct sockaddr_dl *)ifma->ifma_addr), i++); } } @@ -923,24 +951,27 @@ if(sc->bfe_tx_tag != NULL) { bus_dmamap_unload(sc->bfe_tx_tag, sc->bfe_tx_map); - bus_dmamem_free(sc->bfe_tx_tag, sc->bfe_tx_list, sc->bfe_tx_map); + bus_dmamem_free(sc->bfe_tx_tag, sc->bfe_tx_list, + sc->bfe_tx_map); bus_dma_tag_destroy(sc->bfe_tx_tag); sc->bfe_tx_tag = NULL; } if(sc->bfe_rx_tag != NULL) { bus_dmamap_unload(sc->bfe_rx_tag, sc->bfe_rx_map); - bus_dmamem_free(sc->bfe_rx_tag, sc->bfe_rx_list, sc->bfe_rx_map); + bus_dmamem_free(sc->bfe_rx_tag, sc->bfe_rx_list, + sc->bfe_rx_map); bus_dma_tag_destroy(sc->bfe_rx_tag); sc->bfe_rx_tag = NULL; } if(sc->bfe_tag != NULL) { for(i = 0; i < BFE_TX_LIST_CNT; i++) { - bus_dmamap_destroy(sc->bfe_tag, sc->bfe_tx_ring[i].bfe_map); + bus_dmamap_destroy(sc->bfe_tag, + sc->bfe_tx_ring[i].bfe_map); } bus_dma_tag_destroy(sc->bfe_tag); - sc->bfe_tag = NULL; + sc->bfe_tag = NULL; } if(sc->bfe_parent_tag != NULL) @@ -1074,9 +1105,9 @@ chipidx = CSR_READ_4(sc, BFE_DMATX_STAT) & BFE_STAT_CDMASK; chipidx /= sizeof(struct bfe_desc); - i = sc->bfe_tx_cons; + i = sc->bfe_tx_cons; /* Go through the mbufs and free those that have been transmitted */ - while(i != chipidx) { + while(i != chipidx) { struct bfe_data *r = &sc->bfe_tx_ring[i]; if(r->bfe_mbuf != NULL) { ifp->if_opackets++; @@ -1084,8 +1115,8 @@ r->bfe_mbuf = NULL; bus_dmamap_unload(sc->bfe_tag, r->bfe_map); } - sc->bfe_tx_cnt--; - BFE_INC(i, BFE_TX_LIST_CNT); + sc->bfe_tx_cnt--; + BFE_INC(i, BFE_TX_LIST_CNT); } if(i != sc->bfe_tx_cons) { @@ -1138,6 +1169,7 @@ if (flags & BFE_RX_FLAG_SERR) ifp->if_collisions++; bfe_list_newbuf(sc, cons, m); + BFE_INC(cons, BFE_RX_LIST_CNT); continue; } @@ -1148,6 +1180,7 @@ } else { bfe_list_newbuf(sc, cons, m); ifp->if_ierrors++; + BFE_INC(cons, BFE_RX_LIST_CNT); continue; } @@ -1157,7 +1190,7 @@ (*ifp->if_input)(ifp, m); BFE_LOCK(sc); - BFE_INC(cons, BFE_RX_LIST_CNT); + BFE_INC(cons, BFE_RX_LIST_CNT); } sc->bfe_rx_cons = cons; BFE_UNLOCK(sc); @@ -1225,8 +1258,8 @@ { struct bfe_desc *d = NULL; struct bfe_data *r = NULL; - struct mbuf *m; - u_int32_t frag, cur, cnt = 0; + struct mbuf *m; + u_int32_t frag, cur, cnt = 0; int chainlen = 0; if(BFE_TX_LIST_CNT - sc->bfe_tx_cnt < 2) @@ -1273,15 +1306,20 @@ /* Set start of frame */ d->bfe_ctrl |= BFE_DESC_SOF; if(cur == BFE_TX_LIST_CNT - 1) - /* Tell the chip to wrap to the start of the descriptor list */ + /* + * Tell the chip to wrap to the start of + * the descriptor list + */ d->bfe_ctrl |= BFE_DESC_EOT; - bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void*), m->m_len, - bfe_dma_map_desc, d, 0); - bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREREAD); + bus_dmamap_load(sc->bfe_tag, + r->bfe_map, mtod(m, void*), m->m_len, + bfe_dma_map_desc, d, 0); + bus_dmamap_sync(sc->bfe_tag, r->bfe_map, + BUS_DMASYNC_PREREAD); frag = cur; - BFE_INC(cur, BFE_TX_LIST_CNT); + BFE_INC(cur, BFE_TX_LIST_CNT); cnt++; } } @@ -1314,8 +1352,8 @@ BFE_LOCK(sc); /* - * not much point trying to send if the link is down or we have nothing to - * send + * Not much point trying to send if the link is down + * or we have nothing to send. */ if (!sc->bfe_link && ifp->if_snd.ifq_len < 10) { BFE_UNLOCK(sc); @@ -1333,8 +1371,8 @@ break; /* - * Pack the data into the tx ring. If we dont have enough room, let - * the chip drain the ring + * Pack the data into the tx ring. If we dont have + * enough room, let the chip drain the ring. */ if(bfe_encap(sc, m_head, &idx)) { IF_PREPEND(&ifp->if_snd, m_head); @@ -1378,8 +1416,8 @@ bfe_chip_reset(sc); if (bfe_list_rx_init(sc) == ENOBUFS) { - printf("bfe%d: bfe_init failed. Not enough memory for list buffers\n", - sc->bfe_unit); + printf("bfe%d: bfe_init: Not enough memory for list buffers\n", + sc->bfe_unit); bfe_stop(sc); return; } @@ -1473,7 +1511,8 @@ case SIOCGIFMEDIA: case SIOCSIFMEDIA: mii = device_get_softc(sc->bfe_miibus); - error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); + error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, + command); break; default: error = ether_ioctl(ifp, command, data); @@ -1548,7 +1587,7 @@ ifp = &sc->arpcom.ac_if; bfe_chip_halt(sc); - bfe_tx_ring_free(sc); + bfe_tx_ring_free(sc); bfe_rx_ring_free(sc); ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); ==== //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#2 (text+ko) ==== @@ -18,20 +18,20 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * Cronyx Id: if_ct.c,v 1.1.2.20.2.1 2004/02/13 14:48:24 rik Exp $ + * Cronyx Id: if_ct.c,v 1.1.2.22 2004/02/26 19:06:51 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.1 2004/02/23 20:19:00 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.2 2004/03/02 16:39:40 rik Exp $"); #include #if __FreeBSD_version >= 500000 -# define NCT 1 +# define NCTAU 1 #else -# include "ct.h" +# include "ctau.h" #endif -#if NCT > 0 +#if NCTAU > 0 #include #include #include @@ -88,7 +88,7 @@ # if __FreeBSD_version < 500000 # include "sppp.h" # if NSPPP <= 0 -# error The device ct requires sppp or netgraph. +# error The device ctau requires sppp or netgraph. # endif # endif # include @@ -188,9 +188,9 @@ static void ct_initialize (void *softc); #endif -static ct_board_t *adapter [NCT]; -static drv_t *channel [NCT*NCHAN]; -static struct callout_handle led_timo [NCT]; +static ct_board_t *adapter [NCTAU]; +static drv_t *channel [NCTAU*NCHAN]; +static struct callout_handle led_timo [NCTAU]; static struct callout_handle timeout_handle; /* @@ -234,7 +234,7 @@ drv_t *d; int s, i; - for (i=0; inum, irq, mask, busy); */ ct_probe_irq (b, 0); return 0; @@ -372,7 +372,7 @@ bus_set_resource (child, SYS_RES_IOPORT, 0, iobase, NPORT); - if (devcount >= NCT) + if (devcount >= NCTAU) break; } } else { @@ -1260,7 +1260,7 @@ { drv_t *d; - if (minor(dev) >= NCT*NCHAN || ! (d = channel[minor(dev)])) + if (minor(dev) >= NCTAU*NCHAN || ! (d = channel[minor(dev)])) return ENXIO; CT_DEBUG2 (d, ("ct_open\n")); @@ -1325,7 +1325,7 @@ switch (cmd) { case SERIAL_GETREGISTERED: bzero (mask, sizeof(mask)); - for (s=0; s 501000 */ +#elif __FreeBSD_version < 502103 +static struct cdevsw ct_cdevsw = { + .d_open = ct_open, + .d_close = ct_close, + .d_ioctl = ct_ioctl, + .d_name = "ct", + .d_maj = CDEV_MAJOR, + .d_flags = D_NAGGED, +}; +#else /* __FreeBSD_version >= 502103 */ static struct cdevsw ct_cdevsw = { .d_version = D_VERSION, .d_open = ct_open, @@ -1893,7 +1902,7 @@ .d_ioctl = ct_ioctl, .d_name = "ct", .d_maj = CDEV_MAJOR, - .d_flags = D_NAGGED | D_NEEDGIANT, + .d_flags = D_NEEDGIANT, }; #endif /* __FreeBSD_version > 501000 */ @@ -2438,7 +2447,7 @@ { int i; - for (i=0;iport) @@ -2496,7 +2505,7 @@ ct_close_board (b); } - for (i=0; iport) @@ -2506,7 +2515,7 @@ untimeout (ct_led_off, b, led_timo[i]); } - for (i=0; iport) @@ -2520,7 +2529,7 @@ } /* Detach the interfaces, free buffer memory. */ - for (i=0; i= 502103 dev = udev2dev (makeudev(CDEV_MAJOR, 0)); +#else + dev = makedev (CDEV_MAJOR, 0); +#endif switch (type) { case MOD_LOAD: - if ((cdsw = devsw (dev)) && cdsw->d_maj == CDEV_MAJOR) { + if (dev != NODEV && + (cdsw = devsw (dev)) && + cdsw->d_maj == CDEV_MAJOR) { printf ("Tau-ISA driver is already in system\n"); return (ENXIO); } @@ -2734,4 +2749,4 @@ SYSINIT (ctdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE+CDEV_MAJOR, ct_drvinit, 0) #endif /* KLD_MODULE */ #endif /* __FreeBSD_version < 400000 */ -#endif /* NCT */ +#endif /* NCTAU */ ==== //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#3 (text+ko) ==== @@ -19,10 +19,10 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * Cronyx Id: if_cx.c,v 1.1.2.22 2004/02/05 17:10:19 rik Exp $ + * Cronyx Id: if_cx.c,v 1.1.2.23 2004/02/26 17:56:40 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.6 2004/02/21 21:32:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.7 2004/03/02 16:44:07 rik Exp $"); #include @@ -2548,9 +2548,21 @@ .d_dump = nodump, .d_flags = D_TTY, }; -#else /* __FreeBSD_version > 501000 */ +#elif __FreeBSD_version < 502103 +static struct cdevsw cx_cdevsw = { + .d_open = cx_open, + .d_close = cx_close, + .d_read = cx_read, + .d_write = cx_write, + .d_ioctl = cx_ioctl, + .d_poll = ttypoll, + .d_name = "cx", + .d_maj = CDEV_MAJOR, + .d_flags = D_TTY, +}; +#else /* __FreeBSD_version >= 502103 */ static struct cdevsw cx_cdevsw = { - .d_version = D_VERSION, + .d_version = D_VERSION, .d_open = cx_open, .d_close = cx_close, .d_read = cx_read, @@ -3105,10 +3117,16 @@ static int load_count = 0; struct cdevsw *cdsw; +#if __FreeBSD_version >= 502103 dev = udev2dev (makeudev(CDEV_MAJOR, 0)); +#else + dev = makedev (CDEV_MAJOR, 0); +#endif switch (type) { case MOD_LOAD: - if ((cdsw = devsw (dev)) && cdsw->d_maj == CDEV_MAJOR) { + if (dev != NODEV && + (cdsw = devsw (dev)) && + cdsw->d_maj == CDEV_MAJOR) { printf ("Sigma driver is already in system\n"); return (EEXIST); } ==== //depot/projects/netperf_socket/sys/dev/md/md.c#4 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.112 2004/02/29 15:58:54 cperciva Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.113 2004/03/02 20:13:23 phk Exp $ * */ @@ -1050,6 +1050,10 @@ sc->secsize = DEV_BSIZE; sc->npage = mdio->md_size / (PAGE_SIZE / DEV_BSIZE); sc->nsect = sc->npage * (PAGE_SIZE / DEV_BSIZE); + if (mdio->md_fwsectors != 0) + sc->fwsectors = mdio->md_fwsectors; + if (mdio->md_fwheads != 0) + sc->fwheads = mdio->md_fwheads; sc->object = vm_pager_allocate(OBJT_SWAP, NULL, PAGE_SIZE * (vm_offset_t)sc->npage, VM_PROT_DEFAULT, 0); sc->flags = mdio->md_options & MD_FORCE; ==== //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.11 2004/01/24 21:23:12 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.12 2004/03/02 19:03:26 peter Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -153,7 +153,12 @@ if (uaa->vendor == USB_VENDOR_FTDI && (uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX || uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM || - uaa->product == USB_PRODUCT_FTDI_CFA_631)) + uaa->product == USB_PRODUCT_FTDI_CFA_631 || + uaa->product == USB_PRODUCT_FTDI_USBSERIAL || + uaa->product == USB_PRODUCT_FTDI_MX2_3 || + uaa->product == USB_PRODUCT_FTDI_MX4_5 || + uaa->product == USB_PRODUCT_FTDI_LK202 || + uaa->product == USB_PRODUCT_FTDI_LK204)) return (UMATCH_VENDOR_PRODUCT); return (UMATCH_NONE); @@ -207,6 +212,11 @@ break; case USB_PRODUCT_FTDI_SERIAL_8U232AM: case USB_PRODUCT_FTDI_CFA_631: + case USB_PRODUCT_FTDI_USBSERIAL: + case USB_PRODUCT_FTDI_MX2_3: + case USB_PRODUCT_FTDI_MX4_5: + case USB_PRODUCT_FTDI_LK202: + case USB_PRODUCT_FTDI_LK204: sc->sc_type = UFTDI_TYPE_8U232AM; sc->sc_hdrlen = 0; break; ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.163 2004/02/28 00:12:46 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.164 2004/03/02 19:01:30 peter Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -898,6 +898,13 @@ /* Macally products */ product MACALLY MOUSE1 0x0101 mouse +/* Matrix Orbital products */ +product FTDI USBSERIAL 0xfa00 Matrix Orbital USB Serial +product FTDI MX2_3 0xfa01 Matrix Orbital MX2 or MX3 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 2 20:20:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1034E16A4D0; Tue, 2 Mar 2004 20:20:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D2616A4CE for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B850C43D39 for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i234KGGe030005 for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i234KGcs030002 for perforce@freebsd.org; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Tue, 2 Mar 2004 20:20:16 -0800 (PST) Message-Id: <200403030420.i234KGcs030002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48029 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, 03 Mar 2004 04:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=48029 Change 48029 by jmallett@jmallett_oingo on 2004/03/02 20:19:32 IFC, do evil things to the order for MIPS! Affected files ... .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#10 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.73 2004/01/15 10:07:59 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.75 2004/02/26 07:08:33 bde Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -7,16 +7,19 @@ # SRCS to get dependencies. # +# # ../Makefile.inc will put an absolute path to our objdir in CFLAGS. # Prevent mkdep from using it, so that we don't have to give rules for # aliases of generated headers. +# +CFLAGS+= -I. -CFLAGS+= -I. -static -DGENERATOR_FILE - .include "../Makefile.inc" .PATH: ${GCCDIR} +CFLAGS+= -DGENERATOR_FILE + #----------------------------------------------------------------------- # insn-* gunk @@ -160,6 +163,9 @@ # The list of headers to go into tconfig.h # TARGET_INC= ansidecl.h +.if ${TARGET_ARCH} == "mips" +TARGET_INC+= ${GCC_CPU}/freebsd.h +.endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h @@ -183,7 +189,9 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif +.if ${TARGET_ARCH} != "mips" TARGET_INC+= ${GCC_CPU}/freebsd.h +.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/freebsd64.h @@ -256,16 +264,16 @@ .for L in ${GTFILES_LANG_DIR_NAMES} c .if exists(${GCCDIR}/$L-config-lang.in) # Source the language config file -$L_GTFILES!= sh -c '. ${GCCDIR}/$L-config-lang.in; echo $$gtfiles' +L_GTFILES!= sh -c '. ${GCCDIR}/$L-config-lang.in; echo $$gtfiles' .else -$L_GTFILES!= sh -c '. ${GCCDIR}/$L/config-lang.in; echo $$gtfiles' +L_GTFILES!= sh -c '. ${GCCDIR}/$L/config-lang.in; echo $$gtfiles' .endif -GTFILES+= ${$L_GTFILES} -.for F in ${$L_GTFILES} +.for F in ${L_GTFILES} GTFILES_FILES+= $F GTFILES_LANGS+= $L .endfor .endfor +GTFILES+= ${GTFILES_FILES} #----------------------------------------------------------------------- # the host/target compiler config. From owner-p4-projects@FreeBSD.ORG Tue Mar 2 23:47:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B5BC16A4D0; Tue, 2 Mar 2004 23:47:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 624F016A4CE for ; Tue, 2 Mar 2004 23:47:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56F8443D3F for ; Tue, 2 Mar 2004 23:47:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i237lZGe081197 for ; Tue, 2 Mar 2004 23:47:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i237lYrI081194 for perforce@freebsd.org; Tue, 2 Mar 2004 23:47:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 23:47:34 -0800 (PST) Message-Id: <200403030747.i237lYrI081194@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 48042 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, 03 Mar 2004 07:47:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=48042 Change 48042 by peter@peter_daintree on 2004/03/02 23:46:57 initial pass at i386->amd64 updates. given no pcibios, large parts of this are going to disappear again, but it keeps an integration record. Affected files ... .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#8 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#13 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#12 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_pir.c#1 branch Differences ... ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#8 (text+ko) ==== @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#13 (text+ko) ==== @@ -33,18 +33,17 @@ #include #include #include -#include #include #include #include #include #include +#ifdef CPU_ELAN +#include +#endif #include #include -#include -#include -#include #include "pcib_if.h" @@ -432,9 +431,16 @@ int legacy_pcib_attach(device_t dev) { + int bus; - device_add_child(dev, "pci", pcib_get_bus(dev)); - + /* + * Look for a PCI BIOS interrupt routing table as that will be + * our method of routing interrupts if we have one. + */ + bus = pcib_get_bus(dev); + if (pci_pir_probe(bus, 0)) + pci_pir_parse(); + device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } @@ -612,3 +618,71 @@ static devclass_t pcibus_pnp_devclass; DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); + + +/* + * Provide a PCI-PCI bridge driver for PCI busses behind PCI-PCI bridges + * that appear in the PCIBIOS Interrupt Routing Table to use the routing + * table for interrupt routing when possible. + */ +static int pcibios_pcib_probe(device_t bus); + +static device_method_t pcibios_pcib_pci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, pcibios_pcib_probe), + DEVMETHOD(device_attach, pcib_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_read_ivar, pcib_read_ivar), + DEVMETHOD(bus_write_ivar, pcib_write_ivar), + DEVMETHOD(bus_alloc_resource, pcib_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), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + + /* pcib interface */ + DEVMETHOD(pcib_maxslots, pcib_maxslots), + DEVMETHOD(pcib_read_config, pcib_read_config), + DEVMETHOD(pcib_write_config, pcib_write_config), + DEVMETHOD(pcib_route_interrupt, pcibios_pcib_route_interrupt), + + {0, 0} +}; + +static driver_t pcibios_pcib_driver = { + "pcib", + pcibios_pcib_pci_methods, + sizeof(struct pcib_softc), +}; + +DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0); + +static int +pcibios_pcib_probe(device_t dev) +{ + int bus; + + if ((pci_get_class(dev) != PCIC_BRIDGE) || + (pci_get_subclass(dev) != PCIS_BRIDGE_PCI)) + return (ENXIO); + bus = pci_read_config(dev, PCIR_SECBUS_1, 1); + if (bus == 0) + return (ENXIO); + if (!pci_pir_probe(bus, 1)) + return (ENXIO); + device_set_desc(dev, "PCIBIOS PCI-PCI bridge"); + return (-2000); +} + +static int +pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin) +{ + return (pci_pir_route_interrupt(pci_get_bus(dev), pci_get_slot(dev), + pci_get_function(dev), pin)); +} ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#12 (text+ko) ==== @@ -29,24 +29,15 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); -#include /* XXX trim includes */ +#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include #include -#include "pcib_if.h" - static int cfgmech; static int devmax; @@ -108,18 +99,6 @@ pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } -/* - * Route a PCI interrupt - */ -int -pci_cfgintr(int bus, int device, int pin, int oldirq) -{ - - printf("pci_cfgintr: can't route an interrupt to %d:%d INT%c without ACPI\n", bus, - device, 'A' + pin - 1); - return (PCI_INVALID_IRQ); -} - /* * Configuration space access using direct register operations */ From owner-p4-projects@FreeBSD.ORG Tue Mar 2 23:48:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B51216A4D2; Tue, 2 Mar 2004 23:48:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 556EC16A4D0 for ; Tue, 2 Mar 2004 23:48:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 334C943D41 for ; Tue, 2 Mar 2004 23:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i237mbGe081362 for ; Tue, 2 Mar 2004 23:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i237maJF081359 for perforce@freebsd.org; Tue, 2 Mar 2004 23:48:36 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Mar 2004 23:48:36 -0800 (PST) Message-Id: <200403030748.i237maJF081359@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 48043 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, 03 Mar 2004 07:48:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=48043 Change 48043 by peter@peter_daintree on 2004/03/02 23:48:10 pcibios? what's that? Affected files ... .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#14 edit .. //depot/projects/hammer/sys/amd64/pci/pci_pir.c#2 delete Differences ... ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#14 (text+ko) ==== @@ -433,13 +433,7 @@ { int bus; - /* - * Look for a PCI BIOS interrupt routing table as that will be - * our method of routing interrupts if we have one. - */ bus = pcib_get_bus(dev); - if (pci_pir_probe(bus, 0)) - pci_pir_parse(); device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } @@ -618,71 +612,3 @@ static devclass_t pcibus_pnp_devclass; DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); - - -/* - * Provide a PCI-PCI bridge driver for PCI busses behind PCI-PCI bridges - * that appear in the PCIBIOS Interrupt Routing Table to use the routing - * table for interrupt routing when possible. - */ -static int pcibios_pcib_probe(device_t bus); - -static device_method_t pcibios_pcib_pci_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, pcibios_pcib_probe), - DEVMETHOD(device_attach, pcib_attach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_read_ivar, pcib_read_ivar), - DEVMETHOD(bus_write_ivar, pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, pcib_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), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - - /* pcib interface */ - DEVMETHOD(pcib_maxslots, pcib_maxslots), - DEVMETHOD(pcib_read_config, pcib_read_config), - DEVMETHOD(pcib_write_config, pcib_write_config), - DEVMETHOD(pcib_route_interrupt, pcibios_pcib_route_interrupt), - - {0, 0} -}; - -static driver_t pcibios_pcib_driver = { - "pcib", - pcibios_pcib_pci_methods, - sizeof(struct pcib_softc), -}; - -DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0); - -static int -pcibios_pcib_probe(device_t dev) -{ - int bus; - - if ((pci_get_class(dev) != PCIC_BRIDGE) || - (pci_get_subclass(dev) != PCIS_BRIDGE_PCI)) - return (ENXIO); - bus = pci_read_config(dev, PCIR_SECBUS_1, 1); - if (bus == 0) - return (ENXIO); - if (!pci_pir_probe(bus, 1)) - return (ENXIO); - device_set_desc(dev, "PCIBIOS PCI-PCI bridge"); - return (-2000); -} - -static int -pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin) -{ - return (pci_pir_route_interrupt(pci_get_bus(dev), pci_get_slot(dev), - pci_get_function(dev), pin)); -} From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:09:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66AF016A4D0; Wed, 3 Mar 2004 00:09:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A34016A4CE for ; Wed, 3 Mar 2004 00:09:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E30F43D1D for ; Wed, 3 Mar 2004 00:09:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i23892Ge086483 for ; Wed, 3 Mar 2004 00:09:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i23892OB086480 for perforce@freebsd.org; Wed, 3 Mar 2004 00:09:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:09:02 -0800 (PST) Message-Id: <200403030809.i23892OB086480@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 48045 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, 03 Mar 2004 08:09:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=48045 Change 48045 by peter@peter_daintree on 2004/03/03 00:08:50 checkpoint Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#2 edit .. //depot/projects/hammer/sys/amd64/conf/NOTES.fixed#2 delete Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -3,9 +3,12 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. +# (XXX from i386:NOTES,v 1.1106; merge in updates) +# $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $ # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $ -# + +# We don't have modules on amd64. +makeoptions NO_MODULES=not_yet # # This directive is mandatory; it defines the architecture to be @@ -13,22 +16,58 @@ # compatibles. # machine amd64 -cpu HAMMER # # We want LINT to cover profiling as well -profile 2 +#X#profile 2 + + +##################################################################### +# SMP OPTIONS: +# +# The apic device enables the use of the I/O APIC for interrupt delivery. +# The apic device can be used in both UP and SMP kernels, but is required +# for SMP kernels. Thus, the apic device is not strictly an SMP option, +# but it is a prerequisite for SMP. +# +# Notes: +# +# Be sure to disable 'cpu I386_CPU' for SMP kernels. +# +# By default, mixed mode is used to route IRQ0 from the AT timer via +# the 8259A master PIC through the ExtINT pin on the first I/O APIC. +# This can be disabled via the NO_MIXED_MODE option. In that case, +# IRQ0 will be routed via an intpin on the first I/O APIC. Not all +# motherboards hook IRQ0 up to the first I/O APIC even though their +# MP table or MADT may claim to do so. That is why mixed mode is +# enabled by default. +# + +# Optional: +device atpic +device mptable +options NO_MIXED_MODE # Disable use of mixed mode -# Debug options -options NPX_DEBUG # enable npx debugging (FPU/math emu) - #new math emulator +##################################################################### +# CPU OPTIONS + +# +# You must specify at least one CPU (the one you intend to run on); +# deleting the specification for CPUs you don't need to use may make +# parts of the system run faster. +# +cpu HAMMER + +# +# Options for CPU features. +# # # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -options PERFMON +#X#options PERFMON ##################################################################### @@ -65,14 +104,17 @@ options CLK_CALIBRATION_LOOP +# The following two options measure the frequency of the corresponding +# clock relative to the RTC (onboard mc146818a). + +options CLK_USE_I8254_CALIBRATION +options CLK_USE_TSC_CALIBRATION + ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -hint.speaker.0.at="isa" -hint.speaker.0.port="0x61" device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! -device apm_saver # Requires APM ##################################################################### @@ -109,6 +151,9 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. +options AUTO_EOI_1 +#options AUTO_EOI_2 + options MAXMEM=(128*1024) #options BROKEN_KEYBOARD_RESET @@ -133,7 +178,19 @@ # Optional devices: # +# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create +# the /dev/3dfx0 device to work with glide implementations. This should get +# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as +# the tdfx DRI module from XFree86 and is completely unrelated. # +# To enable Linuxulator support, one must also include COMPAT_LINUX in the +# config as well, or you will not have the dependencies. The other option +# is to load both as modules. + +device tdfx # Enable 3Dfx Voodoo support +#X#options TDFX_LINUX # Enable Linuxulator support + +# # ACPI support using the Intel ACPI Component Architecture reference # implementation. # @@ -142,17 +199,29 @@ # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). # +# ACPI_MAX_THREADS sets the number of task threads started. +# +# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. +# +# ACPICA_PEDANTIC enables strict checking of AML. Our default is to +# relax these checks to allow code generated by the Microsoft compiler +# to still execute. +# # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # device acpi options ACPI_DEBUG +options ACPI_MAX_THREADS=1 +#!options ACPI_NO_SEMAPHORES +#!options ACPICA_PEDANTIC # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # r128drm: ATI Rage 128 # radeondrm: ATI Radeon up to 9000/9100 +# sisdrm: SiS 300/305,540,630 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # DRM_DEBUG: include debug printfs, very slow # # mga requires AGP in the kernel, and it is recommended @@ -161,71 +230,31 @@ device mgadrm device "r128drm" device radeondrm +device sisdrm device tdfxdrm options DRM_DEBUG -# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README -###device fla -###hint.fla.0.at="isa" - # # Network interfaces: # -# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) -# (requires miibus) -# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; -# Intel EtherExpress -# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and -# Am79C960) -# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) -# wl: Lucent Wavelan (ISA card only). +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) -# Order for ISA/EISA devices is important here - -device ed -#options ED_NO_MIIBUS # Disable ed miibus support -hint.ed.0.at="isa" -hint.ed.0.port="0x280" -hint.ed.0.irq="5" -hint.ed.0.maddr="0xd8000" -device lnc -hint.lnc.0.at="isa" -hint.lnc.0.port="0x280" -hint.lnc.0.irq="10" -hint.lnc.0.drq="0" -device sr -hint.sr.0.at="isa" -hint.sr.0.port="0x300" -hint.sr.0.irq="5" -hint.sr.0.maddr="0xd0000" -device wl -hint.wl.0.at="isa" -hint.wl.0.port="0x300" -options WLCACHE # enables the signal-strength cache -options WLDEBUG # enables verbose debugging output +#X#device ath +#X#device ath_hal # Atheros HAL (includes binary component) +device wlan # 802.11 layer # # ATA raid adapters # -device pst +#XXX this stores pointers in a 32bit field that is defined by the hardware +#device pst # # SCSI host adapters: -# -# ncv: NCR 53C500 based SCSI host adapters. -# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. -# stg: TMC 18C30, 18C50 based SCSI host adapters. +# -device ncv -device nsp -device stg -hint.stg.0.at="isa" -hint.stg.0.port="0x140" -hint.stg.0.port="11" - # # Adaptec FSA RAID controllers, including integrated DELL controllers, # the Dell PERC 2/QC and the HP NetRAID-4M @@ -249,12 +278,7 @@ # # Miscellaneous hardware: # -# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # digi: Digiboard driver -# gsc: Genius GS-4500 hand scanner. -# spic: Sony Programmable I/O controller (VAIO notebooks) -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -262,15 +286,6 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -# Notes on the Digiboard PC/Xi and PC/Xe series driver -# -# The NDGBPORTS option specifies the number of ports controlled by the -# dgb(4) driver. The default value is 16 ports per device. -# -# The following flag values have special meanings in dgb: -# 0x01 - alternate layout of pins -# 0x02 - use the windowed PC/Xe in 64K mode - device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -289,20 +304,13 @@ # # Laptop/Notebook options: # -# See also: -# apm under `Miscellaneous hardware' -# above. + -# PCI bus Cards: -# -------------- +# +# I2C Bus # -# Cyclades Cyclom-Y PCI serial driver -device cy -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -#hint.cy.0.at="isa" -#hint.cy.0.irq="10" -#hint.cy.0.maddr="0xd4000" -#hint.cy.0.msize="0x2000" + +#--------------------------------------------------------------------------- # # Set the number of PV entries per process. Increasing this can @@ -315,48 +323,52 @@ # # The value below is the one more than the default. # -#options PMAP_SHPGPERPROC=201 +options PMAP_SHPGPERPROC=201 -# -# Change the size of the kernel virtual address space. Due to -# constraints in loader(8) on i386, this must be a multiple of 4. -# 256 = 1 GB of kernel address space. Increasing this also causes -# a reduction of the address space in user processes. 512 splits -# the 4GB cpu address space in half (2GB user, 2GB kernel). -# -options KVA_PAGES=260 - ##################################################################### # ABI Emulation +#XXX keep these here for now and reactivate when support for emulating +#XXX these 32 bit binaries is added. + +# Enable iBCS2 runtime support for SCO and ISC binaries +#X#options IBCS2 + +# Emulate spx device for client side of SVR3 local X interface +#X#options SPX_HACK + # Enable Linux ABI emulation -#options COMPAT_LINUX +#X#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#options LINPROCFS +#X#options LINPROCFS + +# +# SysVR4 ABI emulation +# +# The svr4 ABI emulator can be statically compiled into the kernel or loaded as +# a KLD module. +# The STREAMS network emulation code can also be compiled statically or as a +# module. If loaded as a module, it must be loaded before the svr4 module +# (the /usr/sbin/svr4 script does this for you). If compiling statically, +# the `streams' device must be configured into any kernel which also +# specifies COMPAT_SVR4. It is possible to have a statically-configured +# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 +# script understands that it doesn't need to load the `streams' module under +# those circumstances. +# Caveat: At this time, `options KTRACE' is required for the svr4 emulator +# (whether static or dynamic). +# +#X#options COMPAT_SVR4 # build emulator statically +#X#options DEBUG_SVR4 # enable verbose debugging +#X#device streams # STREAMS network driver (required for svr4). ##################################################################### # VM OPTIONS -# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the -# kernel to use a 4 MByte pages to map the kernel instead of 4k pages. -# This saves on the amount of memory needed for page tables needed to -# map the kernel. You should only disable this feature as a temporary -# workaround if you are having problems with it enabled. -# -#options DISABLE_PSE - -# Disable the global pages PGE CPU feature. The PGE feature allows pages -# to be marked with the PG_G bit. TLB entries for these pages are not -# flushed from the cache when %cr3 is reloaded. This can make context -# switches less expensive. You should only disable this feature as a -# temporary workaround if you are having problems with it enabled. -# -#options DISABLE_PG_G - # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. @@ -369,6 +381,10 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev +# PECOFF module (Win32 Execution Format) +#X#options PECOFF_SUPPORT +#X#options PECOFF_DEBUG + options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 @@ -382,3 +398,25 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE + +############################################################### +# Broken stuff that shouldn't really be broken + +# machine/ioctl_meteor.h and machine/bt848.h +nodevice bktr + +# pointer/int stuff +nodevice mgadrm +nodevice "r128drm" +nodevice radeondrm +nodevice sisdrm +nodevice tdfxdrm + +# missing conf lines (must be fixed ASAP) +nooption SC_DFLT_FONT +nooption UKBD_DFLT_KEYMAP +nooption ATKBD_DFLT_KEYMAP +nooption PMAP_SHPGPERPROC +nooption CLK_USE_I8254_CALIBRATION +# XXX dead option +nooption CLK_USE_TSC_CALIBRATION From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:28:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DE7616A4D1; Wed, 3 Mar 2004 00:28:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44C9C16A4D0 for ; Wed, 3 Mar 2004 00:28:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 216C443D2F for ; Wed, 3 Mar 2004 00:28:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238SSGe090610 for ; Wed, 3 Mar 2004 00:28:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238SRAD090607 for perforce@freebsd.org; Wed, 3 Mar 2004 00:28:27 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:28:27 -0800 (PST) Message-Id: <200403030828.i238SRAD090607@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 48047 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, 03 Mar 2004 08:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48047 Change 48047 by peter@peter_daintree on 2004/03/03 00:27:29 IFC @48044 Affected files ... .. //depot/projects/hammer/contrib/diff/diff.h#3 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.c#4 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#4 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#19 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#7 integrate .. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#4 integrate .. //depot/projects/hammer/sys/amd64/include/dvcfg.h#1 branch .. //depot/projects/hammer/sys/amd64/include/physio_proc.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#12 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#13 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#11 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lncvar.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#26 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#26 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#31 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.c#3 integrate .. //depot/projects/hammer/usr.sbin/nologin/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/nologin/nologin.5#1 branch .. //depot/projects/hammer/usr.sbin/nologin/nologin.8#1 branch .. //depot/projects/hammer/usr.sbin/nologin/nologin.c#1 branch Differences ... ==== //depot/projects/hammer/contrib/diff/diff.h#3 (text+ko) ==== @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with GNU DIFF; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $FreeBSD: src/contrib/diff/diff.h,v 1.3 2004/02/16 22:54:45 ache Exp $ */ #include "system.h" #include ==== //depot/projects/hammer/gnu/lib/libregex/regex.c#4 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.11 2004/02/25 02:39:10 ache Exp $ */ /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the ==== //depot/projects/hammer/gnu/lib/libregex/regex.h#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/gnu/lib/libregex/regex.h,v 1.5 2004/02/25 02:39:10 ache Exp $ */ #ifndef _REGEX_H #include ==== //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#3 (text+ko) ==== @@ -18,8 +18,6 @@ /* Written June, 1988 by Mike Haertel Modified July, 1988 by Arthur David Olson to assist BMG speedups */ -/* $FreeBSD: src/gnu/usr.bin/grep/dfa.c,v 1.14 2004/03/01 08:37:20 ache Exp $ */ - #ifdef HAVE_CONFIG_H #include #endif ==== //depot/projects/hammer/gnu/usr.bin/grep/search.c#3 (text+ko) ==== @@ -18,8 +18,6 @@ /* Written August 1992 by Mike Haertel. */ -/* $FreeBSD: src/gnu/usr.bin/grep/search.c,v 1.12 2004/03/01 08:37:20 ache Exp $ */ - #ifdef HAVE_CONFIG_H # include #endif ==== //depot/projects/hammer/lib/libc/stdio/fvwrite.c#2 (text+ko) ==== @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.15 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.16 2004/03/02 19:43:51 jkh Exp $"); +#include #include #include #include @@ -67,8 +68,10 @@ if ((len = uio->uio_resid) == 0) return (0); /* make sure we can write */ - if (cantwrite(fp)) + if (cantwrite(fp)) { + errno = EBADF; return (EOF); + } #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define COPY(n) (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n)) ==== //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#4 (text+ko) ==== @@ -62,7 +62,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.6 2004/03/01 17:57:05 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.7 2004/03/03 03:05:21 ache Exp $"); #include #include @@ -97,6 +97,13 @@ #define EMSG "" +#ifdef GNU_COMPATIBLE +#define NO_PREFIX (-1) +#define D_PREFIX 0 +#define DD_PREFIX 1 +#define W_PREFIX 2 +#endif + static int getopt_internal(int, char * const *, const char *, const struct option *, int *, int); static int parse_long_options(char * const *, const char *, @@ -112,15 +119,15 @@ /* Error messages */ static const char recargchar[] = "option requires an argument -- %c"; -/* From P1003.2 */ -static const char illoptchar[] = "illegal option -- %c"; +static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */ #ifdef GNU_COMPATIBLE +static int dash_prefix = NO_PREFIX; static const char gnuoptchar[] = "invalid option -- %c"; -static const char recargstring[] = "option `--%s' requires an argument"; -static const char ambig[] = "option `--%.*s' is ambiguous"; -static const char noarg[] = "option `--%.*s' doesn't allow an argument"; -static const char illoptstring[] = "unrecognized option `--%s'"; +static const char recargstring[] = "option `%s%s' requires an argument"; +static const char ambig[] = "option `%s%.*s' is ambiguous"; +static const char noarg[] = "option `%s%.*s' doesn't allow an argument"; +static const char illoptstring[] = "unrecognized option `%s%s'"; #else static const char recargstring[] = "option requires an argument -- %s"; static const char ambig[] = "ambiguous option -- %.*s"; @@ -193,10 +200,29 @@ const struct option *long_options, int *idx, int short_too) { char *current_argv, *has_equal; +#ifdef GNU_COMPATIBLE + char *current_dash; +#endif size_t current_argv_len; int i, match; current_argv = place; +#ifdef GNU_COMPATIBLE + switch (dash_prefix) { + case D_PREFIX: + current_dash = "-"; + break; + case DD_PREFIX: + current_dash = "--"; + break; + case W_PREFIX: + current_dash = "-W "; + break; + default: + current_dash = ""; + break; + } +#endif match = -1; optind++; @@ -231,7 +257,11 @@ else { /* ambiguous abbreviation */ if (PRINT_ERROR) - warnx(ambig, (int)current_argv_len, + warnx(ambig, +#ifdef GNU_COMPATIBLE + current_dash, +#endif + (int)current_argv_len, current_argv); optopt = 0; return (BADCH); @@ -241,7 +271,11 @@ if (long_options[match].has_arg == no_argument && has_equal) { if (PRINT_ERROR) - warnx(noarg, (int)current_argv_len, + warnx(noarg, +#ifdef GNU_COMPATIBLE + current_dash, +#endif + (int)current_argv_len, current_argv); /* * XXX: GNU sets optopt to val regardless of flag @@ -272,6 +306,9 @@ */ if (PRINT_ERROR) warnx(recargstring, +#ifdef GNU_COMPATIBLE + current_dash, +#endif current_argv); /* * XXX: GNU sets optopt to val regardless of flag @@ -289,7 +326,11 @@ return (-1); } if (PRINT_ERROR) - warnx(illoptstring, current_argv); + warnx(illoptstring, +#ifdef GNU_COMPATIBLE + current_dash, +#endif + current_argv); optopt = 0; return (BADCH); } @@ -431,9 +472,15 @@ if (long_options != NULL && place != nargv[optind] && (*place == '-' || (flags & FLAG_LONGONLY))) { short_too = 0; - if (*place == '-') +#ifdef GNU_COMPATIBLE + dash_prefix = D_PREFIX; +#endif + if (*place == '-') { place++; /* --foo long option */ - else if (*place != ':' && strchr(options, *place) != NULL) +#ifdef GNU_COMPATIBLE + dash_prefix = DD_PREFIX; +#endif + } else if (*place != ':' && strchr(options, *place) != NULL) short_too = 1; /* could be short option too */ optchar = parse_long_options(nargv, options, long_options, @@ -479,6 +526,9 @@ return (BADARG); } else /* white space */ place = nargv[optind]; +#ifdef GNU_COMPATIBLE + dash_prefix = W_PREFIX; +#endif optchar = parse_long_options(nargv, options, long_options, idx, 0); place = EMSG; ==== //depot/projects/hammer/sbin/camcontrol/camcontrol.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.51 2003/08/05 09:19:07 johan Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.52 2004/03/03 01:51:24 ken Exp $"); #include #include @@ -166,7 +166,9 @@ const char **subopt); #ifndef MINIMALISTIC static int getdevlist(struct cam_device *device); +#endif /* MINIMALISTIC */ static int getdevtree(void); +#ifndef MINIMALISTIC static int testunitready(struct cam_device *device, int retry_count, int timeout, int quiet); static int scsistart(struct cam_device *device, int startstop, int loadeject, @@ -303,8 +305,11 @@ return(1); } - bzero(&(&ccb.ccb_h)[1], - sizeof(struct ccb_dev_match) - sizeof(struct ccb_hdr)); + bzero(&ccb, sizeof(union ccb)); + + ccb.ccb_h.path_id = CAM_XPT_PATH_ID; + ccb.ccb_h.target_id = CAM_TARGET_WILDCARD; + ccb.ccb_h.target_lun = CAM_LUN_WILDCARD; ccb.ccb_h.func_code = XPT_DEV_MATCH; bufsize = sizeof(struct dev_match_result) * 100; @@ -3380,6 +3385,11 @@ errx(1, "numeric device specification must " "be either bus:target, or " "bus:target:lun"); + /* default to 0 if lun was not specified */ + if ((arglist & CAM_ARG_LUN) == 0) { + lun = 0; + arglist |= CAM_ARG_LUN; + } optstart++; } else { if (cam_get_device(argv[2], name, sizeof name, &unit) ==== //depot/projects/hammer/share/man/man4/acpi.4#19 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.30 2004/02/22 00:50:00 njl Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.31 2004/03/03 03:02:17 njl Exp $ .\" .Dd July 2, 2001 .Dt ACPI 4 @@ -52,16 +52,11 @@ be compiled into the kernel. .Sh ENVIRONMENT This support is still experimental, and thus there are many debugging -and tuning options which are managed via the kernel environment -space, and set in the +and tuning options which are managed via the kernel environment. +Tunables can be set at the .Xr loader 8 -before booting the kernel. -Kernel environment variables may also be configured in the -.Xr loader -configuration file -.Pa /boot/loader.conf -or the device resource hints file -.Pa /boot/device.hints . +prompt before booting the kernel or stored in +.Pa /boot/loader.conf . .Pp Debugging is separated between layers and levels, where a layer is a portion of the ACPI subsystem, and a level is a particular kind @@ -102,25 +97,25 @@ .It .Li ACPI_ALL_COMPONENTS .It +.Li ACPI_AC_ADAPTER +.It +.Li ACPI_BATTERY +.It .Li ACPI_BUS .It -.Li ACPI_SYSTEM -.It -.Li ACPI_POWER +.Li ACPI_BUTTON .It .Li ACPI_EC .It -.Li ACPI_AC_ADAPTER +.Li ACPI_FAN .It -.Li ACPI_BATTERY +.Li ACPI_POWER .It -.Li ACPI_BUTTON -.It .Li ACPI_PROCESSOR .It .Li ACPI_THERMAL .It -.Li ACPI_FAN +.Li ACPI_TIMER .It .Li ACPI_ALL_DRIVERS .El @@ -231,7 +226,7 @@ in case of problems. To disable a sub-driver, list it in the kernel environment variable -.Va debug.acpi.disable . +.Va debug.acpi.disabled . Multiple entries can be listed, separated by a space. .Pp ACPI sub-devices and features that can be disabled: @@ -324,7 +319,7 @@ Enables loading of a custom ACPI DSDT. .It Va acpi_dsdt_name Name of the DSDT table to load, if loading is enabled. -.It Va debug.acpi.disable +.It Va debug.acpi.disabled Selectively disables portions of ACPI for debugging purposes. .It Va hint.acpi.0.disabled Disables all of ACPI. ==== //depot/projects/hammer/share/man/man4/man4.i386/cx.4#7 (text+ko) ==== @@ -11,7 +11,7 @@ .\" works or modified versions. .\" .\" Cronyx Id: cp.4,v 1.1.2.2 2003/09/11 14:56:50 rik Exp $ -.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.19 2004/03/02 18:20:42 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.20 2004/03/02 20:42:21 brueffer Exp $ .\" .Dd November 27, 2003 .Dt CX 4 i386 @@ -80,7 +80,6 @@ .Nm adapter configuration. .Sh SEE ALSO -.Xr cx 4 , .Xr sppp 4 , .Xr ifconfig 8 , .Xr sconfig 8 , ==== //depot/projects/hammer/share/man/man4/ubtbcmfw.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.3 2003/10/12 22:04:19 emax Exp $ +.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.4 2004/03/02 18:38:32 brueffer Exp $ .\" .Dd April 28, 2003 .Dt UBTBCMFW 4 @@ -44,7 +44,7 @@ .Pp The control transfers can only happen on the control endpoint which is always endpoint 0. -Control request are issued by +Control requests are issued by .Xr ioctl 2 calls. .Pp @@ -52,7 +52,7 @@ To perform I/O on an interrupt endpoint, .Xr read 2 should be used. -All I/O operations on a interrupt endpoint are unbuffered. +All I/O operations on an interrupt endpoint are unbuffered. Interrupt endpoint is always endpoint 1. .Pp Only outgoing bulk transfers are supported on a bulk endpoint. ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#23 (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.120 2004/02/21 21:10:39 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.121 2004/03/03 03:02:16 njl Exp $ */ #include "opt_acpi.h" @@ -85,10 +85,28 @@ struct mtx acpi_mutex; #endif +struct acpi_quirks { + char *OemId; + uint32_t OemRevision; + char *value; +}; + +#define ACPI_OEM_REV_ANY 0 + +static struct acpi_quirks acpi_quirks_table[] = { +#ifdef notyet + /* Bad PCI routing table. Used on some SuperMicro boards. */ + { "PTLTD ", 0x06040000, "pci_link" }, +#endif + + { NULL, 0, NULL } +}; + static int acpi_modevent(struct module *mod, int event, void *junk); static void acpi_identify(driver_t *driver, device_t parent); static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); +static void acpi_quirks_set(void); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); static int acpi_print_child(device_t bus, device_t child); @@ -207,7 +225,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (started) - return_VALUE(error); + return_VALUE (error); started = 1; #if __FreeBSD_version >= 500000 @@ -226,7 +244,7 @@ #endif if (ACPI_FAILURE(error = AcpiInitializeSubsystem())) { printf("ACPI: initialisation failed: %s\n", AcpiFormatException(error)); - return_VALUE(error); + return_VALUE (error); } #ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); @@ -241,7 +259,11 @@ printf("ACPI: table load failed: %s\n", AcpiFormatException(error)); return_VALUE(error); } - return_VALUE(AE_OK); + + /* Set up any quirks we have for this XSDT. */ + acpi_quirks_set(); + + return_VALUE (AE_OK); } /* @@ -553,6 +575,46 @@ return_VALUE (error); } +static void +acpi_quirks_set() +{ + XSDT_DESCRIPTOR *xsdt; + struct acpi_quirks *quirk; + char *env, *tmp; + int len; + + /* If the user specifies "noquirks", leave the settings alone. */ + len = 0; + if ((env = getenv("debug.acpi.disabled")) != NULL) { + if (strstr("noquirks", env) != NULL) + goto out; + len = strlen(env); + } + + /* + * Search through our quirk table and concatenate the disabled + * values with whatever we find. + */ + xsdt = AcpiGbl_XSDT; + for (quirk = acpi_quirks_table; quirk->OemId; quirk++) { + if (!strncmp(xsdt->OemId, quirk->OemId, strlen(quirk->OemId)) && + (xsdt->OemRevision == quirk->OemRevision || + quirk->OemRevision == ACPI_OEM_REV_ANY)) { + len += strlen(quirk->value) + 2; + if ((tmp = malloc(len, M_TEMP, M_NOWAIT)) == NULL) + goto out; + sprintf(tmp, "%s %s", env ? env : "", quirk->value); + setenv("debug.acpi.disabled", tmp); + free(tmp, M_TEMP); + break; + } + } + +out: + if (env) + freeenv(env); +} + /* * Handle a new device being added */ @@ -590,7 +652,6 @@ return (retval); } - /* * Handle per-device ivars */ @@ -1832,24 +1893,24 @@ char *cp, *env; int len; - if ((env = getenv("debug.acpi.disable")) == NULL) + if ((env = getenv("debug.acpi.disabled")) == NULL) return (0); - if (!strcmp(env, "all")) { + if (strcmp(env, "all") == 0) { freeenv(env); return (1); } - /* scan the disable list checking for a match */ + /* Scan the disable list, checking for a match. */ cp = env; for (;;) { - while ((*cp != 0) && isspace(*cp)) + while (*cp != '\0' && isspace(*cp)) cp++; - if (*cp == 0) + if (*cp == '\0') break; len = 0; - while ((cp[len] != 0) && !isspace(cp[len])) + while (cp[len] != '\0' && !isspace(cp[len])) len++; - if (!strncmp(cp, subsys, len)) { + if (strncmp(cp, subsys, len) == 0) { freeenv(env); return (1); } @@ -2211,16 +2272,16 @@ {"ACPI_CA_DISASSEMBLER", ACPI_CA_DISASSEMBLER}, {"ACPI_ALL_COMPONENTS", ACPI_ALL_COMPONENTS}, - {"ACPI_BUS", ACPI_BUS}, - {"ACPI_SYSTEM", ACPI_SYSTEM}, - {"ACPI_POWER", ACPI_POWER}, - {"ACPI_EC", ACPI_EC}, {"ACPI_AC_ADAPTER", ACPI_AC_ADAPTER}, {"ACPI_BATTERY", ACPI_BATTERY}, + {"ACPI_BUS", ACPI_BUS}, {"ACPI_BUTTON", ACPI_BUTTON}, + {"ACPI_EC", ACPI_EC}, + {"ACPI_FAN", ACPI_FAN}, + {"ACPI_POWERRES", ACPI_POWERRES}, {"ACPI_PROCESSOR", ACPI_PROCESSOR}, {"ACPI_THERMAL", ACPI_THERMAL}, - {"ACPI_FAN", ACPI_FAN}, + {"ACPI_TIMER", ACPI_TIMER}, {"ACPI_ALL_DRIVERS", ACPI_ALL_DRIVERS}, {NULL, 0} }; ==== //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.17 2004/02/12 20:45:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.18 2004/03/03 03:02:16 njl Exp $"); #include "opt_acpi.h" #include @@ -58,7 +58,7 @@ MALLOC_DEFINE(M_ACPIPWR, "acpipwr", "ACPI power resources"); /* Hooks for the ACPI CA debugging infrastructure */ -#define _COMPONENT ACPI_POWER +#define _COMPONENT ACPI_POWERRES ACPI_MODULE_NAME("POWERRES") /* Return values from _STA on a power resource */ ==== //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#5 (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/acpica/acpi_timer.c,v 1.25 2003/08/28 16:06:30 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.26 2004/03/03 03:02:16 njl Exp $ */ #include "opt_acpi.h" #include @@ -52,7 +52,7 @@ */ /* Hooks for the ACPI CA debugging infrastructure */ -#define _COMPONENT ACPI_SYSTEM +#define _COMPONENT ACPI_TIMER ACPI_MODULE_NAME("TIMER") static device_t acpi_timer_dev; ==== //depot/projects/hammer/sys/dev/acpica/acpivar.h#19 (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.54 2004/02/19 18:20:03 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.55 2004/03/03 03:02:16 njl Exp $ */ #include "bus_if.h" @@ -115,17 +115,16 @@ * ACPI CA does not define layers for non-ACPI CA drivers. * We define some here within the range provided. */ -#define ACPI_BUS 0x00010000 -#define ACPI_SYSTEM 0x00020000 -#define ACPI_POWER 0x00040000 -#define ACPI_EC 0x00080000 -#define ACPI_AC_ADAPTER 0x00100000 -#define ACPI_BATTERY 0x00200000 -#define ACPI_BUTTON 0x00400000 +#define ACPI_AC_ADAPTER 0x00010000 +#define ACPI_BATTERY 0x00020000 +#define ACPI_BUS 0x00040000 +#define ACPI_BUTTON 0x00080000 +#define ACPI_EC 0x00100000 +#define ACPI_FAN 0x00200000 +#define ACPI_POWERRES 0x00400000 #define ACPI_PROCESSOR 0x00800000 #define ACPI_THERMAL 0x01000000 -#define ACPI_FAN 0x02000000 -#define ACPI_TOSHIBA 0x04000000 +#define ACPI_TIMER 0x02000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). ==== //depot/projects/hammer/sys/dev/drm/drm_drv.h#12 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.21 2004/02/21 21:10:42 phk Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.22 2004/03/03 06:18:29 obrien Exp $ */ /* @@ -829,7 +829,7 @@ drm_file_t *priv; DRM_DEVICE; int retcode = 0; - DRMFILE filp = (void *)(DRM_CURRENTPID); + DRMFILE filp = (void *)(intptr_t)(DRM_CURRENTPID); DRM_DEBUG( "open_count = %d\n", dev->open_count ); @@ -907,7 +907,7 @@ } } #elif __HAVE_DMA - DRM(reclaim_buffers)( dev, (void *)priv->pid ); + DRM(reclaim_buffers)( dev, (void *)(intptr_t)priv->pid ); #endif #if defined (__FreeBSD__) && (__FreeBSD_version >= 500000) @@ -952,7 +952,7 @@ int nr = DRM_IOCTL_NR(cmd); drm_file_t *priv; - DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)DRM_CURRENTPID); + DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID); atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] ); ++priv->ioctl_count; @@ -1007,7 +1007,7 @@ !priv->authenticated)) return EACCES; - retcode = func(kdev, cmd, data, flags, p, (void *)DRM_CURRENTPID); + retcode = func(kdev, cmd, data, flags, p, (void *)(intptr_t)DRM_CURRENTPID); return DRM_ERR(retcode); } @@ -1038,7 +1038,7 @@ DRM_LOCK(); for (;;) { if (DRM(lock_take)(&dev->lock.hw_lock->lock, lock.context)) { - dev->lock.filp = (void *)DRM_CURRENTPID; + dev->lock.filp = (void *)(intptr_t)DRM_CURRENTPID; dev->lock.lock_time = jiffies; atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); break; /* Got lock */ ==== //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#11 (text+ko) ==== @@ -28,7 +28,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.17 2004/02/21 19:42:50 phk Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.18 2004/03/03 06:19:03 obrien Exp $ */ #include @@ -178,7 +178,7 @@ #define DRM_GET_PRIV_WITH_RETURN(_priv, _filp) \ do { \ - if (_filp != (DRMFILE)DRM_CURRENTPID) { \ + if (_filp != (DRMFILE)(intptr_t)DRM_CURRENTPID) { \ DRM_ERROR("filp doesn't match curproc\n"); \ return EINVAL; \ } \ @@ -291,6 +291,12 @@ #define DRM_READMEMORYBARRIER() alpha_mb(); #define DRM_WRITEMEMORYBARRIER() alpha_wmb(); #define DRM_MEMORYBARRIER() alpha_mb(); +#elif defined(__amd64__) +#define DRM_READMEMORYBARRIER() __asm __volatile( \ + "lock; addl $0,0(%%rsp)" : : : "memory"); +#define DRM_WRITEMEMORYBARRIER() __asm __volatile("" : : : "memory"); +#define DRM_MEMORYBARRIER() __asm __volatile( \ + "lock; addl $0,0(%%rsp)" : : : "memory"); #endif #define PAGE_ALIGN(addr) round_page(addr) ==== //depot/projects/hammer/sys/dev/drm/drm_vm.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * DEALINGS IN THE SOFTWARE. * * - * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.8 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.9 2004/03/03 06:18:29 obrien Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 @@ -68,7 +68,7 @@ drm_map_list_entry_t *listentry = NULL; drm_file_t *priv; - DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)DRM_CURRENTPID); + DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID); if (!priv->authenticated) return DRM_ERR(EACCES); ==== //depot/projects/hammer/sys/dev/drm/radeon_state.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * Gareth Hughes * Kevin E. Martin * - * $FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.9 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.10 2004/03/03 06:20:36 obrien Exp $ */ #include "dev/drm/radeon.h" @@ -2400,7 +2400,7 @@ break; case RADEON_PARAM_SAREA_HANDLE: /* The lock is the first dword in the sarea. */ - value = (int)dev->lock.hw_lock; + value = (long)dev->lock.hw_lock; break; case RADEON_PARAM_GART_TEX_HANDLE: value = dev_priv->gart_textures_offset; @@ -2409,7 +2409,7 @@ return DRM_ERR(EINVAL); } - if ( DRM_COPY_TO_USER( param.value, &value, sizeof(int) ) ) { + if ( DRM_COPY_TO_USER( param.value, &value, sizeof(&value) ) ) { DRM_ERROR( "copy_to_user\n" ); return DRM_ERR(EFAULT); } ==== //depot/projects/hammer/sys/dev/drm/sis_mm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Sung-Ching Lin * - * $FreeBSD: src/sys/dev/drm/sis_mm.c,v 1.2 2003/10/24 01:48:17 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/sis_mm.c,v 1.3 2004/03/03 06:20:36 obrien Exp $ */ #include "dev/drm/sis.h" @@ -368,7 +368,7 @@ if (i < MAX_CONTEXT) { set_t *set; - unsigned int item; + ITEM_TYPE item; int retval; DRM_DEBUG("find socket %d, context = %d\n", i, context); @@ -377,7 +377,7 @@ set = global_ppriv[i].sets[0]; retval = setFirst(set, &item); while (retval) { - DRM_DEBUG("free video memory 0x%x\n", item); + DRM_DEBUG("free video memory 0x%lx\n", item); #if defined(__linux__) && defined(CONFIG_FB_SIS) sis_free(item); #else @@ -391,7 +391,7 @@ set = global_ppriv[i].sets[1]; retval = setFirst(set, &item); while (retval) { - DRM_DEBUG("free agp memory 0x%x\n", item); + DRM_DEBUG("free agp memory 0x%lx\n", item); mmFreeMem((PMemBlock)item); retval = setNext(set, &item); } ==== //depot/projects/hammer/sys/dev/ed/if_ed.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.226 2004/03/03 07:33:43 obrien Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -100,7 +100,7 @@ /* u_short */ int, /* u_short */ int); static u_short ed_hpp_write_mbufs(struct ed_softc *, struct mbuf *, int); -static u_short ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, int); +static u_short ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, long); static void ed_setrcr (struct ed_softc *); @@ -1149,7 +1149,8 @@ sc->tx_page_start = memsize / ED_PAGE_SIZE; if (ED_FLAGS_GETTYPE(flags) == ED_FLAGS_GWETHER) { - int x, i, mstart = 0, msize = 0; + int x, i, msize = 0; + long mstart = 0; char pbuf0[ED_PAGE_SIZE], pbuf[ED_PAGE_SIZE], tbuf[ED_PAGE_SIZE]; for (i = 0; i < ED_PAGE_SIZE; i++) @@ -1198,10 +1199,10 @@ } if (msize == 0) { - device_printf(dev, "Cannot find any RAM, start : %d, x = %d.\n", mstart, x); + device_printf(dev, "Cannot find any RAM, start : %ld, x = %d.\n", mstart, x); return (ENXIO); } - device_printf(dev, "RAM start at %d, size : %d.\n", mstart, msize); + device_printf(dev, "RAM start at %ld, size : %d.\n", mstart, msize); sc->mem_size = msize; sc->mem_start = (caddr_t) mstart; @@ -2214,7 +2215,7 @@ } } } else { - len = ed_pio_write_mbufs(sc, m, (int)buffer); + len = ed_pio_write_mbufs(sc, m, (long)buffer); if (len == 0) { m_freem(m0); goto outloop; @@ -2290,7 +2291,7 @@ if (sc->mem_shared) packet_hdr = *(struct ed_ring *) packet_ptr; else - ed_pio_readmem(sc, (int)packet_ptr, (char *) &packet_hdr, + ed_pio_readmem(sc, (long)packet_ptr, (char *) &packet_hdr, sizeof(packet_hdr)); len = packet_hdr.count; if (len > (ETHER_MAX_LEN - ETHER_CRC_LEN + sizeof(struct ed_ring)) || @@ -2761,7 +2762,7 @@ if (sc->mem_shared) bcopy(src, dst, tmp_amount); else - ed_pio_readmem(sc, (int)src, dst, tmp_amount); + ed_pio_readmem(sc, (long)src, dst, tmp_amount); amount -= tmp_amount; src = sc->mem_ring; @@ -2770,7 +2771,7 @@ if (sc->mem_shared) bcopy(src, dst, amount); else - ed_pio_readmem(sc, (int)src, dst, amount); + ed_pio_readmem(sc, (long)src, dst, amount); return (src + amount); } @@ -2861,7 +2862,7 @@ void ed_pio_readmem(sc, src, dst, amount) struct ed_softc *sc; - int src; + long src; unsigned char *dst; unsigned short amount; { @@ -2951,7 +2952,7 @@ ed_pio_write_mbufs(sc, m, dst) struct ed_softc *sc; struct mbuf *m; - int dst; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:34:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1798F16A4D1; Wed, 3 Mar 2004 00:34:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF40116A4CF for ; Wed, 3 Mar 2004 00:34:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADEB343D31 for ; Wed, 3 Mar 2004 00:34:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238YaGe092585 for ; Wed, 3 Mar 2004 00:34:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238Ya53092582 for perforce@freebsd.org; Wed, 3 Mar 2004 00:34:36 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:34:36 -0800 (PST) Message-Id: <200403030834.i238Ya53092582@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 48049 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, 03 Mar 2004 08:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=48049 Change 48049 by peter@peter_daintree on 2004/03/03 00:33:43 IFC @48048 Affected files ... .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#13 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.h#2 integrate Differences ... ==== //depot/projects/hammer/sys/dev/drm/drm_drv.h#13 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.22 2004/03/03 06:18:29 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.23 2004/03/03 08:27:33 obrien Exp $ */ /* @@ -829,7 +829,7 @@ drm_file_t *priv; DRM_DEVICE; int retcode = 0; - DRMFILE filp = (void *)(intptr_t)(DRM_CURRENTPID); + DRMFILE filp = (void *)(uintptr_t)(DRM_CURRENTPID); DRM_DEBUG( "open_count = %d\n", dev->open_count ); @@ -907,7 +907,7 @@ } } #elif __HAVE_DMA - DRM(reclaim_buffers)( dev, (void *)(intptr_t)priv->pid ); + DRM(reclaim_buffers)( dev, (void *)(uintptr_t)priv->pid ); #endif #if defined (__FreeBSD__) && (__FreeBSD_version >= 500000) @@ -952,7 +952,7 @@ int nr = DRM_IOCTL_NR(cmd); drm_file_t *priv; - DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID); + DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(uintptr_t)DRM_CURRENTPID); atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] ); ++priv->ioctl_count; @@ -1007,7 +1007,7 @@ !priv->authenticated)) return EACCES; - retcode = func(kdev, cmd, data, flags, p, (void *)(intptr_t)DRM_CURRENTPID); + retcode = func(kdev, cmd, data, flags, p, (void *)(uintptr_t)DRM_CURRENTPID); return DRM_ERR(retcode); } @@ -1038,7 +1038,7 @@ DRM_LOCK(); for (;;) { if (DRM(lock_take)(&dev->lock.hw_lock->lock, lock.context)) { - dev->lock.filp = (void *)(intptr_t)DRM_CURRENTPID; + dev->lock.filp = (void *)(uintptr_t)DRM_CURRENTPID; dev->lock.lock_time = jiffies; atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); break; /* Got lock */ ==== //depot/projects/hammer/sys/dev/drm/drm_vm.h#8 (text+ko) ==== @@ -22,7 +22,7 @@ * DEALINGS IN THE SOFTWARE. * * - * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.9 2004/03/03 06:18:29 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.10 2004/03/03 08:27:33 obrien Exp $ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 @@ -68,7 +68,7 @@ drm_map_list_entry_t *listentry = NULL; drm_file_t *priv; - DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID); + DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(uintptr_t)DRM_CURRENTPID); if (!priv->authenticated) return DRM_ERR(EACCES); ==== //depot/projects/hammer/sys/dev/drm/sis_ds.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Sung-Ching Lin * - * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.1 2003/09/09 00:24:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.2 2004/03/03 08:24:31 obrien Exp $ */ #ifndef __SIS_DS_H__ @@ -36,7 +36,7 @@ #define SET_SIZE 5000 -typedef unsigned int ITEM_TYPE; +typedef unsigned long ITEM_TYPE; typedef struct { ITEM_TYPE val; From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:36:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D67DE16A4D0; Wed, 3 Mar 2004 00:36:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B179016A4CE for ; Wed, 3 Mar 2004 00:36:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A685143D4C for ; Wed, 3 Mar 2004 00:36:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238aeGe092724 for ; Wed, 3 Mar 2004 00:36:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238aeRE092721 for perforce@freebsd.org; Wed, 3 Mar 2004 00:36:40 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:36:40 -0800 (PST) Message-Id: <200403030836.i238aeRE092721@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 48051 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, 03 Mar 2004 08:36:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=48051 Change 48051 by peter@peter_daintree on 2004/03/03 00:35:39 CLK_USE_TSC_CALIBRATION is OBE Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -108,7 +108,6 @@ # clock relative to the RTC (onboard mc146818a). options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION ##################################################################### @@ -418,5 +417,3 @@ nooption ATKBD_DFLT_KEYMAP nooption PMAP_SHPGPERPROC nooption CLK_USE_I8254_CALIBRATION -# XXX dead option -nooption CLK_USE_TSC_CALIBRATION From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:58:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AF4E16A4D0; Wed, 3 Mar 2004 00:58:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0444916A4CE for ; Wed, 3 Mar 2004 00:58:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D580F43D48 for ; Wed, 3 Mar 2004 00:58:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238w7Ge002816 for ; Wed, 3 Mar 2004 00:58:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238w7Ko002813 for perforce@freebsd.org; Wed, 3 Mar 2004 00:58:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:58:07 -0800 (PST) Message-Id: <200403030858.i238w7Ko002813@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 48053 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, 03 Mar 2004 08:58:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48053 Change 48053 by peter@peter_daintree on 2004/03/03 00:57:29 add two missing opt files Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#19 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#19 (text+ko) ==== @@ -5,11 +5,13 @@ AUTO_EOI_2 opt_auto_eoi.h MAXMEM PERFMON opt_perfmon.h +PMAP_SHPGPERPROC opt_pmap.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h CLK_CALIBRATION_LOOP opt_clock.h +CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h VGA_ALT_SEQACCESS opt_vga.h From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:58:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D467316A4D7; Wed, 3 Mar 2004 00:58:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3250016A4CF for ; Wed, 3 Mar 2004 00:58:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26AE143D48 for ; Wed, 3 Mar 2004 00:58:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238w7Ge002823 for ; Wed, 3 Mar 2004 00:58:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238w7V1002819 for perforce@freebsd.org; Wed, 3 Mar 2004 00:58:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:58:07 -0800 (PST) Message-Id: <200403030858.i238w7V1002819@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 48054 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, 03 Mar 2004 08:58:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=48054 Change 48054 by peter@peter_daintree on 2004/03/03 00:57:55 add generators for font.h, atkbdmap.h, ukbdmap.h (ugh!!) Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#38 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#38 (text+ko) ==== @@ -20,6 +20,21 @@ no-obj no-implicit-rule before-depend \ clean "ia32_assym.h" # +font.h optional sc_dflt_font \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + no-obj no-implicit-rule before-depend \ + clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" +# +atkbdmap.h optional atkbd_dflt_keymap \ + compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "atkbdmap.h" +# +ukbdmap.h optional ukbd_dflt_keymap \ + compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "ukbdmap.h" +# amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi From owner-p4-projects@FreeBSD.ORG Wed Mar 3 00:59:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46CF616A4D0; Wed, 3 Mar 2004 00:59:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17AA816A4CE for ; Wed, 3 Mar 2004 00:59:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D87B43D3F for ; Wed, 3 Mar 2004 00:59:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i238x9Ge002881 for ; Wed, 3 Mar 2004 00:59:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i238x9Bu002878 for perforce@freebsd.org; Wed, 3 Mar 2004 00:59:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 00:59:09 -0800 (PST) Message-Id: <200403030859.i238x9Bu002878@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 48055 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, 03 Mar 2004 08:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48055 Change 48055 by peter@peter_daintree on 2004/03/03 00:59:07 hack workaround for mga/r128 mega-inlining Affected files ... .. //depot/projects/hammer/sys/conf/files#46 edit Differences ... ==== //depot/projects/hammer/sys/conf/files#46 (text+ko) ==== @@ -383,12 +383,14 @@ dev/drm/mga_dma.c optional mgadrm dev/drm/mga_drv.c optional mgadrm dev/drm/mga_irq.c optional mgadrm -dev/drm/mga_state.c optional mgadrm +dev/drm/mga_state.c optional mgadrm \ + compile-with "${NORMAL_C} -finline-limit=20000" dev/drm/mga_warp.c optional mgadrm dev/drm/r128_cce.c optional r128drm dev/drm/r128_drv.c optional r128drm dev/drm/r128_irq.c optional r128drm -dev/drm/r128_state.c optional r128drm +dev/drm/r128_state.c optional r128drm \ + compile-with "${NORMAL_C} -finline-limit=20000" dev/drm/radeon_cp.c optional radeondrm dev/drm/radeon_drv.c optional radeondrm dev/drm/radeon_irq.c optional radeondrm From owner-p4-projects@FreeBSD.ORG Wed Mar 3 01:05:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 740F916A4D0; Wed, 3 Mar 2004 01:05:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5016716A4CE for ; Wed, 3 Mar 2004 01:05:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 139A243D1D for ; Wed, 3 Mar 2004 01:05:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2395HGe005675 for ; Wed, 3 Mar 2004 01:05:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2395HDS005672 for perforce@freebsd.org; Wed, 3 Mar 2004 01:05:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 01:05:17 -0800 (PST) Message-Id: <200403030905.i2395HDS005672@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 48056 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, 03 Mar 2004 09:05:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=48056 Change 48056 by peter@peter_daintree on 2004/03/03 01:05:11 obrien fixed bktr a while back, and drm just got fixed. I re-added the missing options/files entries locally to fix the rest. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#4 (text+ko) ==== @@ -397,23 +397,3 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE - -############################################################### -# Broken stuff that shouldn't really be broken - -# machine/ioctl_meteor.h and machine/bt848.h -nodevice bktr - -# pointer/int stuff -nodevice mgadrm -nodevice "r128drm" -nodevice radeondrm -nodevice sisdrm -nodevice tdfxdrm - -# missing conf lines (must be fixed ASAP) -nooption SC_DFLT_FONT -nooption UKBD_DFLT_KEYMAP -nooption ATKBD_DFLT_KEYMAP -nooption PMAP_SHPGPERPROC -nooption CLK_USE_I8254_CALIBRATION From owner-p4-projects@FreeBSD.ORG Wed Mar 3 11:35:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30B3B16A4D0; Wed, 3 Mar 2004 11:35:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0668E16A4CF for ; Wed, 3 Mar 2004 11:35:27 -0800 (PST) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0DB743D41 for ; Wed, 3 Mar 2004 11:35:26 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 30583 invoked from network); 3 Mar 2004 19:35:26 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 3 Mar 2004 19:35:26 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i23JZK28088763; Wed, 3 Mar 2004 14:35:20 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Peter Wemm Date: Wed, 3 Mar 2004 14:06:22 -0500 User-Agent: KMail/1.6 References: <200403030748.i237maJF081359@repoman.freebsd.org> In-Reply-To: <200403030748.i237maJF081359@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200403031406.22307.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 48043 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, 03 Mar 2004 19:35:27 -0000 On Wednesday 03 March 2004 02:48 am, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=48043 > > Change 48043 by peter@peter_daintree on 2004/03/02 23:48:10 > > pcibios? what's that? You should be ditching all of pci_bus.c and legacy.c then if you are mandating ACPI. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Mar 3 18:08:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3F3816A4D1; Wed, 3 Mar 2004 18:08:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD16E16A4CF for ; Wed, 3 Mar 2004 18:08:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5C1643D2F for ; Wed, 3 Mar 2004 18:08:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2428DGe055917 for ; Wed, 3 Mar 2004 18:08:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2428DTW055914 for perforce@freebsd.org; Wed, 3 Mar 2004 18:08:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 Mar 2004 18:08:13 -0800 (PST) Message-Id: <200403040208.i2428DTW055914@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 48092 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, 04 Mar 2004 02:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=48092 Change 48092 by rwatson@rwatson_tislabs on 2004/03/03 18:07:13 Integrate netperf_socket: - ACPI upgrade - amd64 NOTES - DUMMYNET locking fixes - IPv6 scope changes Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/dvcfg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/physio_proc.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#3 integrate .. //depot/projects/netperf_socket/sys/conf/kern.mk#3 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lncvar.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,31 +4,68 @@ # 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.4 2004/02/19 04:39:14 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $ # +# We don't have modules on amd64. +makeoptions NO_MODULES=not_yet + # # This directive is mandatory; it defines the architecture to be # configured for; in this case, the 386 family based IBM-PC and # compatibles. # machine amd64 -cpu HAMMER -# +# # We want LINT to cover profiling as well -profile 2 +#XXX#profile 2 + + +##################################################################### +# SMP OPTIONS: +# +# The apic device enables the use of the I/O APIC for interrupt delivery. +# The apic device can be used in both UP and SMP kernels, but is required +# for SMP kernels. Thus, the apic device is not strictly an SMP option, +# but it is a prerequisite for SMP. +# +# Notes: +# +# By default, mixed mode is used to route IRQ0 from the AT timer via +# the 8259A master PIC through the ExtINT pin on the first I/O APIC. +# This can be disabled via the NO_MIXED_MODE option. In that case, +# IRQ0 will be routed via an intpin on the first I/O APIC. Not all +# motherboards hook IRQ0 up to the first I/O APIC even though their +# MP table or MADT may claim to do so. That is why mixed mode is +# enabled by default. +# + +# Optional: +device atpic # Legacy pic +device mptable +options NO_MIXED_MODE # Disable use of mixed mode -# Debug options -options NPX_DEBUG # enable npx debugging (FPU/math emu) - #new math emulator +##################################################################### +# CPU OPTIONS + +# +# You must specify at least one CPU (the one you intend to run on); +# deleting the specification for CPUs you don't need to use may make +# parts of the system run faster. +# +cpu HAMMER # aka K8, aka Opteron & Athlon64 + +# +# Options for CPU features. +# # # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -options PERFMON +#XXX#options PERFMON ##################################################################### @@ -39,7 +76,7 @@ # of network device drivers, which has significant benefits in terms # of robustness to overloads and responsivity, as well as permitting # accurate scheduling of the CPU time between kernel network processing -# and other activities. The drawback is a moderate (up to 1/HZ seconds) +# and other activities. The drawback is a moderate (up to 1/HZ seconds) # potential increase in response times. # It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING # to achieve smoother behaviour. @@ -48,8 +85,8 @@ # the CPU fraction reserved to userland with the sysctl variable # kern.polling.user_frac (default 50, range 0..100). # -# Only the "dc" "fxp" and "sis" devices support this mode of operation at -# the time of this writing. +# Not all device drivers support this mode of operation at the time of +# this writing. See polling(4) for more details. options DEVICE_POLLING @@ -59,20 +96,22 @@ # The following options are used for debugging clock behavior only, and # should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. +# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at +# startup until the user presses a key. (The i8254 clock is always +# calibrated relative to the RTC (mc146818a) and this option causes the +# calibration to be repeated.) options CLK_CALIBRATION_LOOP +# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 +# clock to actually be used. +options CLK_USE_I8254_CALIBRATION + ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -hint.speaker.0.at="isa" -hint.speaker.0.port="0x61" -device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! -device apm_saver # Requires APM +device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! ##################################################################### @@ -109,6 +148,9 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. +options AUTO_EOI_1 +#options AUTO_EOI_2 + options MAXMEM=(128*1024) #options BROKEN_KEYBOARD_RESET @@ -125,13 +167,27 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + # -# Mandatory devices: +# Optional devices: # +# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create +# the /dev/3dfx0 device to work with glide implementations. This should get +# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as +# the tdfx DRI module from XFree86 and is completely unrelated. # -# Optional devices: -# +# To enable Linuxulator support, one must also include COMPAT_LINUX in the +# config as well, or you will not have the dependencies. The other option +# is to load both as modules. + +device tdfx # Enable 3Dfx Voodoo support +#XXX#options TDFX_LINUX # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference @@ -142,17 +198,29 @@ # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). # +# ACPI_MAX_THREADS sets the number of task threads started. +# +# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. +# +# ACPICA_PEDANTIC enables strict checking of AML. Our default is to +# relax these checks to allow code generated by the Microsoft compiler +# to still execute. +# # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. -# + device acpi options ACPI_DEBUG +options ACPI_MAX_THREADS=1 +#!options ACPI_NO_SEMAPHORES +#!options ACPICA_PEDANTIC # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # r128drm: ATI Rage 128 # radeondrm: ATI Radeon up to 9000/9100 +# sisdrm: SiS 300/305,540,630 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # DRM_DEBUG: include debug printfs, very slow # # mga requires AGP in the kernel, and it is recommended @@ -161,60 +229,39 @@ device mgadrm device "r128drm" device radeondrm +device sisdrm device tdfxdrm options DRM_DEBUG -# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README -###device fla -###hint.fla.0.at="isa" - # # Network interfaces: # # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) -# (requires miibus) -# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; -# Intel EtherExpress +# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) -# wl: Lucent Wavelan (ISA card only). + +#XXX# Needs to be busdma'ed. +#XXX#device ed +#XXX#device lnc -# Order for ISA/EISA devices is important here +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) -device ed -#options ED_NO_MIIBUS # Disable ed miibus support -hint.ed.0.at="isa" -hint.ed.0.port="0x280" -hint.ed.0.irq="5" -hint.ed.0.maddr="0xd8000" -device lnc -hint.lnc.0.at="isa" -hint.lnc.0.port="0x280" -hint.lnc.0.irq="10" -hint.lnc.0.drq="0" -device sr -hint.sr.0.at="isa" -hint.sr.0.port="0x300" -hint.sr.0.irq="5" -hint.sr.0.maddr="0xd0000" -device wl -hint.wl.0.at="isa" -hint.wl.0.port="0x300" -options WLCACHE # enables the signal-strength cache -options WLDEBUG # enables verbose debugging output +#XXX#device ath +#XXX#device ath_hal # Atheros HAL (includes binary component) +device wlan # 802.11 layer # # ATA raid adapters # -device pst +#XXX this stores pointers in a 32bit field that is defined by the hardware +#device pst -# +# # SCSI host adapters: -# +# # ncv: NCR 53C500 based SCSI host adapters. # nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # stg: TMC 18C30, 18C50 based SCSI host adapters. @@ -222,9 +269,6 @@ device ncv device nsp device stg -hint.stg.0.at="isa" -hint.stg.0.port="0x140" -hint.stg.0.port="11" # # Adaptec FSA RAID controllers, including integrated DELL controllers, @@ -249,12 +293,9 @@ # # Miscellaneous hardware: # -# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) +# cy: Cyclades serial driver # digi: Digiboard driver -# gsc: Genius GS-4500 hand scanner. -# spic: Sony Programmable I/O controller (VAIO notebooks) # stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -262,15 +303,6 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -# Notes on the Digiboard PC/Xi and PC/Xe series driver -# -# The NDGBPORTS option specifies the number of ports controlled by the -# dgb(4) driver. The default value is 16 ports per device. -# -# The following flag values have special meanings in dgb: -# 0x01 - alternate layout of pins -# 0x02 - use the windowed PC/Xe in 64K mode - device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -283,30 +315,128 @@ device digi_Xe device digi_Xem device digi_Xr +#XXX# PCI versions exist, but driver needs to be moved and split up. +#XXX#device stl # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu # # Laptop/Notebook options: # -# See also: -# apm under `Miscellaneous hardware' -# above. + + +# +# I2C Bus +# +#--------------------------------------------------------------------------- +# ISDN4BSD +# +# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd. +# +# i4b passive ISDN cards support contains the following hardware drivers: +# +# isic - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver +# iwic - Winbond W6692 PCI bus ISDN S/T interface controller +# ifpi - AVM Fritz!Card PCI driver +# ifpi2 - AVM Fritz!Card PCI version 2 driver +# itjc - Siemens ISAC / TJNet Tiger300/320 chipset +# +# i4b active ISDN cards support contains the following hardware drivers: +# +# iavc - AVM B1 PCI, AVM B1 ISA, AVM T1 +# +# Note that the ``options'' (if given) and ``device'' lines must BOTH +# be uncommented to enable support for a given card ! +# +# In addition to a hardware driver (and probably an option) the mandatory +# ISDN protocol stack devices and the mandatory support device must be +# enabled as well as one or more devices from the optional devices section. +# +#--------------------------------------------------------------------------- +# isic driver (Siemens/Infineon chipsets) +# +#XXX#device isic +# # PCI bus Cards: # -------------- # -# Cyclades Cyclom-Y PCI serial driver -device cy -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -#hint.cy.0.at="isa" -#hint.cy.0.irq="10" -#hint.cy.0.maddr="0xd4000" -#hint.cy.0.msize="0x2000" +# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) +options ELSA_QS1PCI +# +#--------------------------------------------------------------------------- +# ifpi2 driver for AVM Fritz!Card PCI version 2 +# +# AVM Fritz!Card PCI version 2 +#XXX#device "ifpi2" +# +#--------------------------------------------------------------------------- +# iwic driver for Winbond W6692 chipset +# +# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards) +#XXX#device iwic +# +#--------------------------------------------------------------------------- +# itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset +# +# Traverse Technologies NETjet-S +# Teles PCI-TJ +#XXX#device itjc +# +#--------------------------------------------------------------------------- +# iavc driver (AVM active cards, needs i4bcapi driver!) +# +#XXX#device iavc +# +#--------------------------------------------------------------------------- +# ISDN Protocol Stack - mandatory for all hardware drivers +# +# Q.921 / layer 2 - i4b passive cards D channel handling +#XXX#device "i4bq921" +# +# Q.931 / layer 3 - i4b passive cards D channel handling +#XXX#device "i4bq931" +# +# layer 4 - i4b common passive and active card handling +#XXX#device "i4b" +# +#--------------------------------------------------------------------------- +# ISDN devices - mandatory for all hardware drivers +# +# userland driver to do ISDN tracing (for passive cards only) +#XXX#device "i4btrc" 4 +# +# userland driver to control the whole thing +#XXX#device "i4bctl" +# +#--------------------------------------------------------------------------- +# ISDN devices - optional +# +# userland driver for access to raw B channel +#XXX#device "i4brbch" 4 +# +# userland driver for telephony +#XXX#device "i4btel" 2 +# +# network driver for IP over raw HDLC ISDN +#XXX#device "i4bipr" 4 +# enable VJ header compression detection for ipr i/f +options IPR_VJ +# enable logging of the first n IP packets to isdnd (n=32 here) +options IPR_LOG=32 +# +# network driver for sync PPP over ISDN; requires an equivalent +# number of sppp device to be configured +#XXX#device "i4bisppp" 4 +# +# B-channel interface to the netgraph subsystem +#XXX#device "i4bing" 2 +# +#--------------------------------------------------------------------------- # # Set the number of PV entries per process. Increasing this can -# stop panics related to heavy use of shared memory. However, that can +# stop panics related to heavy use of shared memory. However, that can # (combined with large amounts of physical memory) cause panics at # boot time due the kernel running out of VM space. # @@ -315,48 +445,52 @@ # # The value below is the one more than the default. # -#options PMAP_SHPGPERPROC=201 +options PMAP_SHPGPERPROC=201 -# -# Change the size of the kernel virtual address space. Due to -# constraints in loader(8) on i386, this must be a multiple of 4. -# 256 = 1 GB of kernel address space. Increasing this also causes -# a reduction of the address space in user processes. 512 splits -# the 4GB cpu address space in half (2GB user, 2GB kernel). -# -options KVA_PAGES=260 - ##################################################################### # ABI Emulation +#XXX keep these here for now and reactivate when support for emulating +#XXX these 32 bit binaries is added. + +# Enable iBCS2 runtime support for SCO and ISC binaries +#XXX#options IBCS2 + +# Emulate spx device for client side of SVR3 local X interface +#XXX#options SPX_HACK + # Enable Linux ABI emulation -#options COMPAT_LINUX +#XXX#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#options LINPROCFS +#XXX#options LINPROCFS + +# +# SysVR4 ABI emulation +# +# The svr4 ABI emulator can be statically compiled into the kernel or loaded as +# a KLD module. +# The STREAMS network emulation code can also be compiled statically or as a +# module. If loaded as a module, it must be loaded before the svr4 module +# (the /usr/sbin/svr4 script does this for you). If compiling statically, +# the `streams' device must be configured into any kernel which also +# specifies COMPAT_SVR4. It is possible to have a statically-configured +# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 +# script understands that it doesn't need to load the `streams' module under +# those circumstances. +# Caveat: At this time, `options KTRACE' is required for the svr4 emulator +# (whether static or dynamic). +# +#XXX#options COMPAT_SVR4 # build emulator statically +options DEBUG_SVR4 # enable verbose debugging +#XXX#device streams # STREAMS network driver (required for svr4). ##################################################################### # VM OPTIONS -# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the -# kernel to use a 4 MByte pages to map the kernel instead of 4k pages. -# This saves on the amount of memory needed for page tables needed to -# map the kernel. You should only disable this feature as a temporary -# workaround if you are having problems with it enabled. -# -#options DISABLE_PSE - -# Disable the global pages PGE CPU feature. The PGE feature allows pages -# to be marked with the PG_G bit. TLB entries for these pages are not -# flushed from the cache when %cr3 is reloaded. This can make context -# switches less expensive. You should only disable this feature as a -# temporary workaround if you are having problems with it enabled. -# -#options DISABLE_PG_G - # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. @@ -369,6 +503,10 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev +# PECOFF module (Win32 Execution Format) +options PECOFF_SUPPORT +options PECOFF_DEBUG + options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.48 2004/02/16 02:50:03 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.49 2004/03/04 00:17:14 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -1559,6 +1559,7 @@ cur = (ndis_packet *)*pool; cur->np_private.npp_flags = 0x1; /* mark the head of the list */ + cur->np_private.npp_totlen = 0; /* init deletetion flag */ for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) { cur->np_private.npp_head = (ndis_handle)(cur + 1); cur++; @@ -1595,7 +1596,21 @@ ndis_free_packetpool(pool) ndis_handle pool; { - free(pool, M_DEVBUF); + ndis_packet *head; + + head = pool; + + /* Mark this pool as 'going away.' */ + + head->np_private.npp_totlen = 1; + + /* If there are no buffers loaned out, destroy the pool. */ + + if (head->np_private.npp_count == 0) + free(pool, M_DEVBUF); + else + printf("NDIS: buggy driver deleting active packet pool!\n"); + return; } @@ -1614,6 +1629,16 @@ return; } + /* + * If this pool is marked as 'going away' don't allocate any + * more packets out of it. + */ + + if (head->np_private.npp_totlen) { + *status = NDIS_STATUS_FAILURE; + return; + } + pkt = (ndis_packet *)head->np_private.npp_head; if (pkt == NULL) { @@ -1662,6 +1687,14 @@ head->np_private.npp_head = (ndis_buffer *)packet; head->np_private.npp_count--; + /* + * If the pool has been marked for deletion and there are + * no more packets outstanding, nuke the pool. + */ + + if (head->np_private.npp_totlen && head->np_private.npp_count == 0) + free(head, M_DEVBUF); + return; } @@ -1749,6 +1782,8 @@ cur = (ndis_buffer *)*pool; cur->nb_flags = 0x1; /* mark the head of the list */ + cur->nb_bytecount = 0; /* init usage count */ + cur->nb_byteoffset = 0; /* init deletetion flag */ for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) { cur->nb_next = cur + 1; cur++; @@ -1762,7 +1797,20 @@ ndis_free_bufpool(pool) ndis_handle pool; { - free(pool, M_DEVBUF); + ndis_buffer *head; + + head = pool; + + /* Mark this pool as 'going away.' */ + + head->nb_byteoffset = 1; + + /* If there are no buffers loaned out, destroy the pool. */ + if (head->nb_bytecount == 0) + free(pool, M_DEVBUF); + else + printf("NDIS: buggy driver deleting active buffer pool!\n"); + return; } @@ -1785,6 +1833,16 @@ return; } + /* + * If this pool is marked as 'going away' don't allocate any + * more buffers out of it. + */ + + if (head->nb_byteoffset) { + *status = NDIS_STATUS_FAILURE; + return; + } + buf = head->nb_next; if (buf == NULL) { @@ -1801,6 +1859,10 @@ *buffer = buf; + /* Increment count of busy buffers. */ + + head->nb_bytecount++; + *status = NDIS_STATUS_SUCCESS; return; } @@ -1822,6 +1884,18 @@ buf->nb_next = head->nb_next; head->nb_next = buf; + /* Decrement count of busy buffers. */ + + head->nb_bytecount--; + + /* + * If the pool has been marked for deletion and there are + * no more buffers outstanding, nuke the pool. + */ + + if (head->nb_byteoffset && head->nb_bytecount == 0) + free(head, M_DEVBUF); + return; } ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.23 2004/02/17 21:50:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.25 2004/03/04 00:17:14 wpaul Exp $"); #include #include @@ -64,6 +64,8 @@ #include #include +#include "opt_ddb.h" + #define __regparm __attribute__((regparm(3))) #define FUNC void(*)(void) @@ -166,6 +168,8 @@ uint8_t, void **, void **); __stdcall static void ntoskrnl_objderef(/*void * */ void); __stdcall static uint32_t ntoskrnl_zwclose(ndis_handle); +static uint32_t ntoskrnl_dbgprint(char *, ...); +__stdcall static void ntoskrnl_debugger(void); __stdcall static void dummy(void); static struct mtx *ntoskrnl_interlock; @@ -1113,6 +1117,18 @@ mdl->nb_next = head->nb_next; head->nb_next = mdl; + /* Decrement count of busy buffers. */ + + head->nb_bytecount--; + + /* + * If the pool has been marked for deletion and there are + * no more buffers outstanding, nuke the pool. + */ + + if (head->nb_byteoffset && head->nb_bytecount == 0) + free(head, M_DEVBUF); + return; } @@ -1604,6 +1620,30 @@ return(0); /* notreached */ } +static uint32_t +ntoskrnl_dbgprint(char *fmt, ...) +{ + va_list ap; + + if (bootverbose) { + va_start(ap, fmt); + vprintf(fmt, ap); + } + + return(STATUS_SUCCESS); +} + +__stdcall static void +ntoskrnl_debugger(void) +{ +#ifdef DDB + Debugger("debug from winkernel module"); +#else + printf("ntoskrnl_debugger(): DDB not present\n"); +#endif + return; +} + __stdcall static void dummy() { @@ -1625,7 +1665,8 @@ { "RtlUnicodeStringToInteger", (FUNC)ntoskrnl_unicode_to_int }, { "sprintf", (FUNC)sprintf }, { "vsprintf", (FUNC)vsprintf }, - { "DbgPrint", (FUNC)printf }, + { "DbgPrint", (FUNC)ntoskrnl_dbgprint }, + { "DbgBreakPoint", (FUNC)ntoskrnl_debugger }, { "strncmp", (FUNC)strncmp }, { "strcmp", (FUNC)strcmp }, { "strncpy", (FUNC)strncpy }, ==== //depot/projects/netperf_socket/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.871 2004/03/01 08:12:55 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.872 2004/03/03 09:33:03 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -383,12 +383,14 @@ dev/drm/mga_dma.c optional mgadrm dev/drm/mga_drv.c optional mgadrm dev/drm/mga_irq.c optional mgadrm -dev/drm/mga_state.c optional mgadrm +dev/drm/mga_state.c optional mgadrm \ + compile-with "${NORMAL_C} -finline-limit=13500" dev/drm/mga_warp.c optional mgadrm dev/drm/r128_cce.c optional r128drm dev/drm/r128_drv.c optional r128drm dev/drm/r128_irq.c optional r128drm -dev/drm/r128_state.c optional r128drm +dev/drm/r128_state.c optional r128drm \ + compile-with "${NORMAL_C} -finline-limit=13500" dev/drm/radeon_cp.c optional radeondrm dev/drm/radeon_drv.c optional radeondrm dev/drm/radeon_irq.c optional radeondrm ==== //depot/projects/netperf_socket/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.28 2004/02/05 01:09:29 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.29 2004/03/03 09:37:44 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -20,6 +20,21 @@ no-obj no-implicit-rule before-depend \ clean "ia32_assym.h" # +font.h optional sc_dflt_font \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + no-obj no-implicit-rule before-depend \ + clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" +# +atkbdmap.h optional atkbd_dflt_keymap \ + compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "atkbdmap.h" +# +ukbdmap.h optional ukbd_dflt_keymap \ + compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "ukbdmap.h" +# amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/netperf_socket/sys/conf/kern.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.39 2004/02/06 20:40:04 peter Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.40 2004/03/03 09:35:06 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -24,7 +24,7 @@ # .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -INLINE_LIMIT?= 15000 +INLINE_LIMIT?= 8000 .endif # ==== //depot/projects/netperf_socket/sys/conf/options.amd64#2 (text+ko) ==== @@ -1,16 +1,29 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.10 2003/11/17 08:58:16 peter Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.11 2004/03/03 09:35:47 obrien Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h MAXMEM PERFMON opt_perfmon.h +PMAP_SHPGPERPROC opt_pmap.h + +# Options for emulators. These should only be used at config time, so +# they are handled like options for static filesystems +# (see src/sys/conf/options), except for broken debugging options. +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h +COMPAT_SVR4 opt_dontuse.h +DEBUG_SVR4 opt_svr4.h +NDISAPI opt_dontuse.h +PECOFF_DEBUG opt_pecoff.h +PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h -CLK_CALIBRATION_LOOP opt_clock.h -TIMER_FREQ opt_clock.h +CLK_CALIBRATION_LOOP opt_clock.h +CLK_USE_I8254_CALIBRATION opt_clock.h +TIMER_FREQ opt_clock.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h @@ -19,9 +32,25 @@ VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h +VESA +VESA_DEBUG opt_vesa.h + ATKBD_DFLT_KEYMAP opt_atkbd.h # ------------------------------- +# isdn4bsd: passive PCI cards +# ------------------------------- +ELSA_QS1PCI opt_i4b.h +# ------------------------------- +# isdn4bsd: misc options +# ------------------------------- +# temporary workaround for SMP machines +I4B_SMP_WORKAROUND opt_i4b.h +# enable VJ compression code for ipr i/f +IPR_VJ opt_i4b.h +IPR_LOG opt_i4b.h + +# ------------------------------- # EOF # ------------------------------- HAMMER opt_cpu.h ==== //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdHardware.c#2 (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/acpica/Osd/OsdHardware.c,v 1.11 2003/08/28 21:22:25 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.12 2004/03/03 18:34:42 njl Exp $ */ /* @@ -166,7 +166,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 3 18:11:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4927F16A4D0; Wed, 3 Mar 2004 18:11:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 242BC16A4CE for ; Wed, 3 Mar 2004 18:11:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EAC843D1F for ; Wed, 3 Mar 2004 18:11:18 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i242BHGe056821 for ; Wed, 3 Mar 2004 18:11:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i242BH8j056815 for perforce@freebsd.org; Wed, 3 Mar 2004 18:11:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 Mar 2004 18:11:17 -0800 (PST) Message-Id: <200403040211.i242BH8j056815@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 48093 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, 04 Mar 2004 02:11:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=48093 Change 48093 by rwatson@rwatson_tislabs on 2004/03/03 18:10:19 Integrate return path cleanup in socket(). Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.173 2004/02/08 07:35:48 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.174 2004/03/04 01:57:48 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -115,7 +115,7 @@ fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd); if (error) - goto done2; + return (error); /* An extra reference on `fp' has been held for us by falloc(). */ mtx_lock(&Giant); error = socreate(uap->domain, &so, uap->type, uap->protocol, @@ -140,7 +140,6 @@ td->td_retval[0] = fd; } fdrop(fp, td); -done2: return (error); } From owner-p4-projects@FreeBSD.ORG Wed Mar 3 19:53:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC6F316A4D0; Wed, 3 Mar 2004 19:53:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 834B716A4CE for ; Wed, 3 Mar 2004 19:53:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DA3F43D2D for ; Wed, 3 Mar 2004 19:53:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i243rLGe078665 for ; Wed, 3 Mar 2004 19:53:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i243rKTg078662 for perforce@freebsd.org; Wed, 3 Mar 2004 19:53:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 Mar 2004 19:53:20 -0800 (PST) Message-Id: <200403040353.i243rKTg078662@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 48094 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, 04 Mar 2004 03:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=48094 Change 48094 by rwatson@rwatson_tislabs on 2004/03/03 19:53:17 Reinstate changes accidentally submerged in netperf+sockets branch, and therefore never integrated into netperf_socket: - Remove Giant from most socket-specific system calls - Use socket lock to protect some things - Use socket buffer lock to protect most other things - XXX the MAC stuff, since in its current form, there's no lock protecting the mutable so_label field, which will need to be addressed (probably by grabbing the socket lock). - Slightly different than the netperf+sockets branch changes to minimize return/whitespace/brace diffs against rwatson_netperf, which will have conditional Giant grabs where Giant was unconditionally removed in this branch. With this change, Giant should now be back off most socket system calls for IPv4. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#4 (text+ko) ==== @@ -117,10 +117,8 @@ if (error) return (error); /* An extra reference on `fp' has been held for us by falloc(). */ - mtx_lock(&Giant); error = socreate(uap->domain, &so, uap->type, uap->protocol, td->td_ucred, td); - mtx_unlock(&Giant); FILEDESC_LOCK(fdp); if (error) { if (fdp->fd_ofiles[fd] == fp) { @@ -174,10 +172,10 @@ struct socket *so; int error; - mtx_lock(&Giant); if ((error = fgetsock(td, fd, &so, NULL)) != 0) goto done2; #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_bind(td->td_ucred, so, sa); if (error) goto done1; @@ -188,7 +186,6 @@ #endif fputsock(so); done2: - mtx_unlock(&Giant); FREE(sa, M_SONAME); return (error); } @@ -208,9 +205,9 @@ struct socket *so; int error; - mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_listen(td->td_ucred, so); if (error) goto done; @@ -221,7 +218,6 @@ #endif fputsock(so); } - mtx_unlock(&Giant); return(error); } @@ -260,12 +256,13 @@ goto done3; } } - mtx_lock(&Giant); error = fgetsock(td, uap->s, &head, &fflag); if (error) goto done2; s = splnet(); + SOCK_LOCK(head); if ((head->so_options & SO_ACCEPTCONN) == 0) { + SOCK_UNLOCK(head); splx(s); error = EINVAL; goto done; @@ -279,9 +276,10 @@ head->so_error = EWOULDBLOCK; break; } - error = tsleep(&head->so_timeo, PSOCK | PCATCH, + error = msleep(&head->so_timeo, SOCK_MTX(head), PSOCK | PCATCH, "accept", 0); if (error) { + SOCK_UNLOCK(head); splx(s); goto done; } @@ -289,6 +287,7 @@ if (head->so_error) { error = head->so_error; head->so_error = 0; + SOCK_UNLOCK(head); splx(s); goto done; } @@ -303,6 +302,7 @@ so = TAILQ_FIRST(&head->so_comp); TAILQ_REMOVE(&head->so_comp, so, so_list); head->so_qlen--; + SOCK_UNLOCK(head); error = falloc(td, &nfp, &fd); if (error) { @@ -312,15 +312,18 @@ * do another wakeup so some other process might * have a chance at it. */ + SOCK_LOCK(head); TAILQ_INSERT_HEAD(&head->so_comp, so, so_list); head->so_qlen++; wakeup_one(&head->so_timeo); + SOCK_UNLOCK(head); splx(s); goto done; } /* An extra reference on `nfp' has been held for us by falloc(). */ td->td_retval[0] = fd; + /* XXX lock? */ /* connection has been removed from the listen queue */ KNOTE(&head->so_rcv.sb_sel.si_note, 0); @@ -408,7 +411,6 @@ fdrop(nfp, td); fputsock(head); done2: - mtx_unlock(&Giant); done3: return (error); } @@ -473,7 +475,6 @@ int error, s; int interrupted = 0; - mtx_lock(&Giant); if ((error = fgetsock(td, fd, &so, NULL)) != 0) goto done2; if (so->so_state & SS_ISCONNECTING) { @@ -481,6 +482,7 @@ goto done1; } #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_connect(td->td_ucred, so, sa); if (error) goto bad; @@ -493,8 +495,10 @@ goto done1; } s = splnet(); + SOCK_LOCK(so); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { - error = tsleep(&so->so_timeo, PSOCK | PCATCH, "connec", 0); + error = msleep(&so->so_timeo, SOCK_MTX(so), PSOCK | PCATCH, + "connec", 0); if (error) { if (error == EINTR || error == ERESTART) interrupted = 1; @@ -505,6 +509,7 @@ error = so->so_error; so->so_error = 0; } + SOCK_UNLOCK(so); splx(s); bad: if (!interrupted) @@ -514,7 +519,6 @@ done1: fputsock(so); done2: - mtx_unlock(&Giant); FREE(sa, M_SONAME); return (error); } @@ -537,7 +541,6 @@ struct socket *so1, *so2; int fd, error, sv[2]; - mtx_lock(&Giant); error = socreate(uap->domain, &so1, uap->type, uap->protocol, td->td_ucred, td); if (error) @@ -609,7 +612,6 @@ free1: (void)soclose(so1); done2: - mtx_unlock(&Giant); return (error); } @@ -695,11 +697,11 @@ int iovlen; #endif - mtx_lock(&Giant); if ((error = fgetsock(td, s, &so, NULL)) != 0) goto bad2; #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_send(td->td_ucred, so); if (error) goto bad; @@ -756,7 +758,6 @@ bad: fputsock(so); bad2: - mtx_unlock(&Giant); return (error); } @@ -936,17 +937,15 @@ int iovlen; #endif - mtx_lock(&Giant); if ((error = fgetsock(td, s, &so, NULL)) != 0) { - mtx_unlock(&Giant); return (error); } #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_receive(td->td_ucred, so); if (error) { fputsock(so); - mtx_unlock(&Giant); return (error); } #endif @@ -1070,7 +1069,6 @@ } out: fputsock(so); - mtx_unlock(&Giant); if (fromsa) FREE(fromsa, M_SONAME); if (control) @@ -1285,12 +1283,10 @@ struct socket *so; int error; - mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { error = soshutdown(so, uap->how); fputsock(so); } - mtx_unlock(&Giant); return(error); } @@ -1318,7 +1314,6 @@ if (uap->valsize < 0) return (EINVAL); - mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { sopt.sopt_dir = SOPT_SET; sopt.sopt_level = uap->level; @@ -1329,7 +1324,6 @@ error = sosetopt(so, &sopt); fputsock(so); } - mtx_unlock(&Giant); return(error); } @@ -1353,7 +1347,6 @@ struct socket *so; struct sockopt sopt; - mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) != 0) goto done2; if (uap->val) { @@ -1383,7 +1376,6 @@ done1: fputsock(so); done2: - mtx_unlock(&Giant); return (error); } @@ -1408,7 +1400,6 @@ socklen_t len; int error; - mtx_lock(&Giant); if ((error = fgetsock(td, uap->fdes, &so, NULL)) != 0) goto done2; error = copyin(uap->alen, &len, sizeof (len)); @@ -1442,7 +1433,6 @@ done1: fputsock(so); done2: - mtx_unlock(&Giant); return (error); } @@ -1493,7 +1483,6 @@ socklen_t len; int error; - mtx_lock(&Giant); if ((error = fgetsock(td, uap->fdes, &so, NULL)) != 0) goto done2; if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) { @@ -1532,7 +1521,6 @@ done1: fputsock(so); done2: - mtx_unlock(&Giant); return (error); } @@ -1686,8 +1674,6 @@ int error, s, headersize = 0, headersent = 0; struct iovec *hdr_iov = NULL; - mtx_lock(&Giant); - hdtr_size = 0; /* @@ -1718,6 +1704,7 @@ } #ifdef MAC + /* XXXRW: MAC requires socket lock? */ error = mac_check_socket_send(td->td_ucred, so); if (error) goto done; @@ -1757,7 +1744,9 @@ /* * Protect against multiple writers to the socket. */ + SOCKBUF_LOCK(&so->so_snd); (void) sblock(&so->so_snd, M_WAITOK); + SOCKBUF_UNLOCK(&so->so_snd); /* * Loop through the pages in the file, starting with the requested @@ -1791,14 +1780,17 @@ * Optimize the non-blocking case by looking at the socket space * before going to the extra work of constituting the sf_buf. */ + SOCKBUF_LOCK(&so->so_snd); if ((so->so_state & SS_NBIO) && sbspace(&so->so_snd) <= 0) { if (so->so_state & SS_CANTSENDMORE) error = EPIPE; else error = EAGAIN; sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); goto done; } + SOCKBUF_UNLOCK(&so->so_snd); VM_OBJECT_LOCK(obj); /* * Attempt to look up the page. @@ -1887,7 +1879,9 @@ } vm_page_unlock_queues(); VM_OBJECT_UNLOCK(obj); + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); goto done; } vm_page_unlock_queues(); @@ -1903,7 +1897,9 @@ if (pg->wire_count == 0 && pg->object == NULL) vm_page_free(pg); vm_page_unlock_queues(); + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); error = EINTR; goto done; } @@ -1940,6 +1936,7 @@ * Add the buffer to the socket buffer chain. */ s = splnet(); + SOCKBUF_LOCK(&so->so_snd); retry_space: /* * Make sure that the socket is still able to take more data. @@ -1961,6 +1958,7 @@ } m_freem(m); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); splx(s); goto done; } @@ -1973,6 +1971,7 @@ if (so->so_state & SS_NBIO) { m_freem(m); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); splx(s); error = EAGAIN; goto done; @@ -1992,14 +1991,20 @@ goto retry_space; } error = (*so->so_proto->pr_usrreqs->pru_send)(so, 0, m, 0, 0, td); + /* XXX: Why release and re-grab? */ + SOCKBUF_UNLOCK(&so->so_snd); splx(s); if (error) { + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); goto done; } headersent = 1; } + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); /* * Send trailers. Wimp out and use writev(2). @@ -2046,8 +2051,6 @@ if (m_header) m_freem(m_header); - mtx_unlock(&Giant); - if (error == ERESTART) error = EINTR; From owner-p4-projects@FreeBSD.ORG Wed Mar 3 21:56:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF6A416A4D1; Wed, 3 Mar 2004 21:56:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 988DB16A4CE for ; Wed, 3 Mar 2004 21:56:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91A2C43D31 for ; Wed, 3 Mar 2004 21:56:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i245uwGe011014 for ; Wed, 3 Mar 2004 21:56:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i245uvwB011011 for perforce@freebsd.org; Wed, 3 Mar 2004 21:56:57 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 21:56:57 -0800 (PST) Message-Id: <200403040556.i245uvwB011011@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 48106 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, 04 Mar 2004 05:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=48106 Change 48106 by peter@peter_daintree on 2004/03/03 21:56:39 IFC @48104 Affected files ... .. //depot/projects/hammer/Makefile.inc1#38 integrate .. //depot/projects/hammer/UPDATING#33 integrate .. //depot/projects/hammer/UPDATING.64BTT#1 branch .. //depot/projects/hammer/etc/defaults/rc.conf#21 integrate .. //depot/projects/hammer/etc/rc.d/virecover#6 integrate .. //depot/projects/hammer/etc/rc.subr#13 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#4 integrate .. //depot/projects/hammer/installworld_newk#1 branch .. //depot/projects/hammer/installworld_oldk#1 branch .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#5 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#6 integrate .. //depot/projects/hammer/sbin/ip6fw/Makefile#3 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#8 integrate .. //depot/projects/hammer/sbin/mount/mount.8#9 integrate .. //depot/projects/hammer/sbin/umount/umount.8#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#35 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#20 integrate .. //depot/projects/hammer/share/man/man4/acpi_video.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#15 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#13 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/hammer/sys/conf/files#47 integrate .. //depot/projects/hammer/sys/conf/files.amd64#39 integrate .. //depot/projects/hammer/sys/conf/kern.mk#16 integrate .. //depot/projects/hammer/sys/conf/options.amd64#20 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#20 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#12 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lncvar.h#3 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#32 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#34 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/hammer/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#9 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#12 integrate .. //depot/projects/hammer/tools/regression/geom_concat/Makefile#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/runtests.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-1.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/test-2.sh#1 branch .. //depot/projects/hammer/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.8#4 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#8 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#38 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.405 2004/02/13 21:52:08 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.407 2004/03/03 22:56:41 gad Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -343,11 +343,70 @@ .ORDER: ${WMAKE_TGTS} # +# Use this to add checks to installworld/installkernel targets. +# +SPECIAL_INSTALLCHECKS= + +# +# The following install-time check will see if the installation will +# change the type used for time_t, and if it will, the target makes +# sure that the user is expecting to make that change. +# +.if ${TARGET_ARCH} == "sparc64" +SPECIAL_INSTALLCHECKS+=sparc64_installcheck + +CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}' +SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}' +NEWSPARC_TIMETYPE?=${CUR_TIMETYPE} +THISHOST!= hostname -s +.if ${THISHOST} == "" +THISHOST="name not set yet" +.endif + +sparc64_installcheck: +.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE} + @echo "" +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} + @echo "*** ERROR: This target would change the type used for time_t! ***" +.else + @echo "* Note: This installation changes the type used for time_t" +.endif + @echo "* " + @echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE}," + @echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}." +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} + @echo "* " + @echo "* If that is *NOT* what you wanted, then you need to change the" + @echo "* typedef for __time_t in: ${.CURDIR}/sys/sparc64/include/_types.h" + @echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'. After that you *MUST* do a" + @echo "* complete cleanworld, buildworld, buildkernel before you retry" + @echo "* your 'make' command. Also read /usr/src/UPDATING.64BTT." + @echo "* " + @echo "* If that *is* what you want, then enter the commands:" + @echo " NEWSPARC_TIMETYPE=${SRC_TIMETYPE}" + @echo " export NEWSPARC_TIMETYPE" + @echo "* and repeat your 'make' command." + @echo "" + @false +.endif + @echo "" +.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} + @echo "" + @echo "*** ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'" + @echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h" + @echo "*** has __time_t defined as: '${SRC_TIMETYPE}'" + @false +.else + @# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}' +.endif +.endif + +# # installcheck # # Checks to be sure system is ready for installworld # -installcheck: +installcheck: ${SPECIAL_INSTALLCHECKS} .if !defined(NO_SENDMAIL) @if ! `id -u smmsp > /dev/null`; then \ echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \ @@ -386,7 +445,7 @@ # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: ${SPECIAL_INSTALLCHECKS} @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -503,7 +562,8 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel reinstallkernel installkernel.debug reinstallkernel.debug: +installkernel installkernel.debug \ +reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install." @false ==== //depot/projects/hammer/UPDATING#33 (text+ko) ==== @@ -17,7 +17,18 @@ developers choose to disable these features on build machines to maximize performance. -20040226: +20040303: + If you are having trouble with the libc_r -> libpthread transition + (see the 20040130 entry), place the following lines at the top of + /etc/libmap.conf: + + libc_r.so.5 libpthread.so.1 + libc_r.so libpthread.so + + This will cause all programs and libraries linked against libc_r + to use libpthread instead. + +20040226: Some sshd configuration defaults have changed: protocol version 1 is no longer enabled by default, and password authentication is disabled by default if PAM is enabled (which it is by default). @@ -1519,4 +1530,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.296 2004/02/26 16:44:31 green Exp $ +$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ ==== //depot/projects/hammer/etc/defaults/rc.conf#21 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.198 2004/02/03 11:26:08 des Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.199 2004/03/03 15:21:01 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -448,6 +448,7 @@ performance_throttle_state="HIGH" # Online throttling state economy_cx_lowest="LOW" # Offline CPU idle state economy_throttle_state="HIGH" # Offline throttling state +virecover_enable="YES" # Perform housekeeping for the vi(1) editor ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/hammer/etc/rc.d/virecover#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.7 2004/01/17 10:59:43 mtm Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.8 2004/03/03 15:21:01 mtm Exp $ # # PROVIDE: virecover @@ -14,6 +14,7 @@ . /etc/rc.subr name="virecover" +rcvar="`set_rcvar`" stop_cmd=":" start_cmd="virecover_start" ==== //depot/projects/hammer/etc/rc.subr#13 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.24 2004/02/27 09:58:50 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.25 2004/03/03 15:28:44 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -267,7 +267,7 @@ fi _proccheck=' - ps -o "pid,command" '"$_psargs"' | + ps 2>/dev/null -o "pid,command" '"$_psargs"' | while read _npid '"$_fp_args"'; do case "$_npid" in PID) ==== //depot/projects/hammer/gnu/usr.bin/tar/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.21 2004/02/17 01:19:54 ache Exp $ +# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.22 2004/03/03 17:04:49 ru Exp $ TARDIR= ${.CURDIR}/../../../contrib/tar .PATH: ${TARDIR}/lib ${TARDIR}/src @@ -25,6 +25,7 @@ # "Rename" tar.1 to gtar.1 so that we can install gtar.1 with # tar.1 as an optional link (rather than vice versa) +CLEANFILES= gtar.1 gtar.1: tar.1 cat ${.CURDIR}/tar.1 > ${.TARGET} ==== //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getopt.3 8.5 (Berkeley) 4/27/95 -.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.8 2004/03/01 17:57:05 ache Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.9 2004/03/03 08:29:00 ache Exp $ .\" .Dd April 1, 2000 .Dt GETOPT_LONG 3 @@ -311,26 +311,26 @@ .\" to .\" mean the preceding option takes an optional argument. .\" .El -.It -Return value in case of missing argument if first character -(after -.Ql + -or -.Ql - ) -in option string is not -.Ql \&: : -.Bl -tag -width ".Bx" -.It Tn GNU -returns -.Ql \&? -.It Bx -returns -.Ql \&: -(since -.Bx Ns 's -.Fn getopt -does). -.El +.\" .It +.\" Return value in case of missing argument if first character +.\" (after +.\" .Ql + +.\" or +.\" .Ql - ) +.\" in option string is not +.\" .Ql \&: : +.\" .Bl -tag -width ".Bx" +.\" .It Tn GNU +.\" returns +.\" .Ql \&? +.\" .It Bx +.\" returns +.\" .Ql \&: +.\" (since +.\" .Bx Ns 's +.\" .Fn getopt +.\" does). +.\" .El .\" .It .\" Handling of .\" .Ql --a ==== //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#5 (text+ko) ==== @@ -62,7 +62,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.7 2004/03/03 03:05:21 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.8 2004/03/03 08:29:00 ache Exp $"); #include #include @@ -284,7 +284,11 @@ optopt = long_options[match].val; else optopt = 0; +#ifdef GNU_COMPATIBLE + return (BADCH); +#else return (BADARG); +#endif } if (long_options[match].has_arg == required_argument || long_options[match].has_arg == optional_argument) { ==== //depot/projects/hammer/lib/libc/sys/select.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)select.2 8.2 (Berkeley) 3/25/94 -.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.26 2004/01/26 15:20:16 eivind Exp $ +.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.27 2004/03/03 14:51:11 dds Exp $ .\" .Dd November 17, 2002 .Dt SELECT 2 @@ -148,6 +148,14 @@ .Bl -tag -width Er .It Bq Er EBADF One of the descriptor sets specified an invalid descriptor. +.It Bq Er EFAULT +One of the arguments +.Fa readfds , +.Fa writefds , +.Fa exceptfds , +or +.Fa timeout +points to an invalid address. .It Bq Er EINTR A signal was delivered before the time limit expired and before any of the selected events occurred. ==== //depot/projects/hammer/sbin/ip6fw/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.5 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.6 2004/03/03 20:21:15 johan Exp $ PROG= ip6fw -WARNS?= 0 +WARNS?= 2 MAN= ip6fw.8 .include ==== //depot/projects/hammer/sbin/ip6fw/ip6fw.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ * NEW command line interface for IP firewall facility * * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $ - * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.16 2004/02/18 15:56:53 dwmalone Exp $ + * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.17 2004/03/03 20:21:15 johan Exp $ */ #include @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -839,8 +840,6 @@ ifu->fu_via_ip6 = in6addr_any; *byname = 0; } else if (!isdigit(*arg)) { - char *q; - *byname = 1; strlcpy(ifu->fu_via_if.name, arg, sizeof(ifu->fu_via_if.name)); /* ==== //depot/projects/hammer/sbin/mount/mount.8#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.64 2004/02/10 06:44:41 trhodes Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.65 2004/03/04 00:52:16 brueffer Exp $ .\" .Dd April 7, 2003 .Dt MOUNT 8 @@ -435,7 +435,7 @@ is set, all operations are performed against the specified file. .Ev PATH_FSTAB will not be honored if the process environment or memory address space is -considred +considered .Dq tainted . (See .Xr issetugid 2 ==== //depot/projects/hammer/sbin/umount/umount.8#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 -.\" $FreeBSD: src/sbin/umount/umount.8,v 1.18 2003/07/18 17:43:13 iedowse Exp $ +.\" $FreeBSD: src/sbin/umount/umount.8,v 1.19 2004/03/04 00:52:16 brueffer Exp $ .\" .Dd July 18, 2003 .Dt UMOUNT 8 @@ -126,7 +126,7 @@ is set, all operations are performed against the specified file. .Ev PATH_FSTAB will not be honored if the process environment or memory address space is -considred +considered .Dq tainted . (See .Xr issetugid 2 ==== //depot/projects/hammer/share/man/man4/Makefile#35 (text+ko) ==== @@ -1,9 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.259 2004/03/01 17:26:39 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.260 2004/03/03 16:34:03 njl Exp $ MAN= aac.4 \ acpi.4 \ acpi_thermal.4 \ + acpi_video.4 \ adv.4 \ adw.4 \ agp.4 \ ==== //depot/projects/hammer/share/man/man4/acpi.4#20 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.31 2004/03/03 03:02:17 njl Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.32 2004/03/04 04:42:59 njl Exp $ .\" .Dd July 2, 2001 .Dt ACPI 4 @@ -266,6 +266,11 @@ .Pq Vt device Supports an ACPI laptop lid switch, which typically puts a system to sleep. +.It Li quirks +.Pq Vt feature +Don't honor quirks. +Quirks automatically disable ACPI functionality based on the XSDT table's +OEM vendor name and revision date. .It Li pci .Pq Vt device Supports Host to PCI bridges. ==== //depot/projects/hammer/share/man/man4/man4.i386/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.157 2004/02/19 19:35:27 philip Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.158 2004/03/03 13:26:18 rik Exp $ MAN= acpi_toshiba.4 \ aic.4 \ @@ -9,6 +9,7 @@ asc.4 \ CPU_ELAN.4 \ cs.4 \ + ct.4 \ cx.4 \ cy.4 \ el.4 \ @@ -48,6 +49,7 @@ wt.4 MLINKS= CPU_ELAN.4 CPU_SOEKRIS.4 +MLINKS+=ct.4 ctau.4 MLINKS+=ndis.4 if_ndis.4 MLINKS+=pae.4 PAE.4 MLINKS+=sbni.4 if_sbni.4 ==== //depot/projects/hammer/share/misc/bsd-family-tree#13 (text+ko) ==== @@ -162,7 +162,8 @@ | | | | | | | | FreeBSD 4.9 | | | OpenBSD 3.4 | | | | | | | | - | v | | | | | + | v | | NetBSD 1.6.2 | | + | | | | | | | | | v | | FreeBSD 5.0 | | | | | | | | BSD/OS 5.0 @@ -393,6 +394,7 @@ OpenBSD 3.4 2003-11-01 [OBD] FreeBSD 5.2 2004-01-12 [FBD] FreeBSD 5.2.1 2004-02-22 [FBD] (patch release) +NetBSD 1.6.2 2004-03-01 [NBD] Bibliography ------------------------ @@ -449,4 +451,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.77 2004/02/25 15:58:14 wosch Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.78 2004/03/04 05:34:29 maxim Exp $ ==== //depot/projects/hammer/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -6,6 +6,8 @@ # (XXX from i386:NOTES,v 1.1106; merge in updates) # $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $ # +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $ +# # We don't have modules on amd64. makeoptions NO_MODULES=not_yet @@ -17,9 +19,9 @@ # machine amd64 -# +# # We want LINT to cover profiling as well -#X#profile 2 +#XXX#profile 2 ##################################################################### @@ -78,7 +80,7 @@ # of network device drivers, which has significant benefits in terms # of robustness to overloads and responsivity, as well as permitting # accurate scheduling of the CPU time between kernel network processing -# and other activities. The drawback is a moderate (up to 1/HZ seconds) +# and other activities. The drawback is a moderate (up to 1/HZ seconds) # potential increase in response times. # It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING # to achieve smoother behaviour. @@ -87,8 +89,8 @@ # the CPU fraction reserved to userland with the sysctl variable # kern.polling.user_frac (default 50, range 0..100). # -# Only the "dc" "fxp" and "sis" devices support this mode of operation at -# the time of this writing. +# Not all device drivers support this mode of operation at the time of +# this writing. See polling(4) for more details. options DEVICE_POLLING @@ -98,10 +100,11 @@ # The following options are used for debugging clock behavior only, and # should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. +# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at +# startup until the user presses a key. (The i8254 clock is always +# calibrated relative to the RTC (mc146818a) and this option causes the +# calibration to be repeated.) options CLK_CALIBRATION_LOOP # The following two options measure the frequency of the corresponding @@ -113,7 +116,7 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! +device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! ##################################################################### @@ -169,13 +172,27 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + # -# Mandatory devices: +# Optional devices: # +# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create +# the /dev/3dfx0 device to work with glide implementations. This should get +# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as +# the tdfx DRI module from XFree86 and is completely unrelated. # -# Optional devices: -# +# To enable Linuxulator support, one must also include COMPAT_LINUX in the +# config as well, or you will not have the dependencies. The other option +# is to load both as modules. + +device tdfx # Enable 3Dfx Voodoo support +#XXX#options TDFX_LINUX # Enable Linuxulator support # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get @@ -208,7 +225,7 @@ # # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. -# + device acpi options ACPI_DEBUG options ACPI_MAX_THREADS=1 @@ -238,8 +255,16 @@ # Network interfaces: # +# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 +# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and +# Am79C960) + +#XXX# Needs to be busdma'ed. +#XXX#device ed +#XXX#device lnc + # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #X#device ath #X#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -250,10 +275,18 @@ #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst +# +# SCSI host adapters: # -# SCSI host adapters: +# ncv: NCR 53C500 based SCSI host adapters. +# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. +# stg: TMC 18C30, 18C50 based SCSI host adapters. # +device ncv +device nsp +device stg + # # Adaptec FSA RAID controllers, including integrated DELL controllers, # the Dell PERC 2/QC and the HP NetRAID-4M @@ -277,7 +310,10 @@ # # Miscellaneous hardware: # +# cy: Cyclades serial driver # digi: Digiboard driver +# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) +# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -297,6 +333,8 @@ device digi_Xe device digi_Xem device digi_Xr +#XXX# PCI versions exist, but driver needs to be moved and split up. +#XXX#device stl # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -310,10 +348,114 @@ # #--------------------------------------------------------------------------- +# ISDN4BSD +# +# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd. +# +# i4b passive ISDN cards support contains the following hardware drivers: +# +# isic - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver +# iwic - Winbond W6692 PCI bus ISDN S/T interface controller +# ifpi - AVM Fritz!Card PCI driver +# ifpi2 - AVM Fritz!Card PCI version 2 driver +# itjc - Siemens ISAC / TJNet Tiger300/320 chipset +# +# i4b active ISDN cards support contains the following hardware drivers: +# +# iavc - AVM B1 PCI, AVM B1 ISA, AVM T1 +# +# Note that the ``options'' (if given) and ``device'' lines must BOTH +# be uncommented to enable support for a given card ! +# +# In addition to a hardware driver (and probably an option) the mandatory +# ISDN protocol stack devices and the mandatory support device must be +# enabled as well as one or more devices from the optional devices section. +# +#--------------------------------------------------------------------------- +# isic driver (Siemens/Infineon chipsets) +# +#XXX#device isic +# +# PCI bus Cards: +# -------------- +# +# +# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) +options ELSA_QS1PCI +# +#--------------------------------------------------------------------------- +# ifpi2 driver for AVM Fritz!Card PCI version 2 +# +# AVM Fritz!Card PCI version 2 +#XXX#device "ifpi2" +# +#--------------------------------------------------------------------------- +# iwic driver for Winbond W6692 chipset +# +# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards) +#XXX#device iwic +# +#--------------------------------------------------------------------------- +# itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset +# +# Traverse Technologies NETjet-S +# Teles PCI-TJ +#XXX#device itjc +# +#--------------------------------------------------------------------------- +# iavc driver (AVM active cards, needs i4bcapi driver!) +# +#XXX#device iavc +# +#--------------------------------------------------------------------------- +# ISDN Protocol Stack - mandatory for all hardware drivers +# +# Q.921 / layer 2 - i4b passive cards D channel handling +#XXX#device "i4bq921" +# +# Q.931 / layer 3 - i4b passive cards D channel handling +#XXX#device "i4bq931" +# +# layer 4 - i4b common passive and active card handling +#XXX#device "i4b" +# +#--------------------------------------------------------------------------- +# ISDN devices - mandatory for all hardware drivers +# +# userland driver to do ISDN tracing (for passive cards only) +#XXX#device "i4btrc" 4 +# +# userland driver to control the whole thing +#XXX#device "i4bctl" +# +#--------------------------------------------------------------------------- +# ISDN devices - optional +# +# userland driver for access to raw B channel +#XXX#device "i4brbch" 4 +# +# userland driver for telephony +#XXX#device "i4btel" 2 +# +# network driver for IP over raw HDLC ISDN +#XXX#device "i4bipr" 4 +# enable VJ header compression detection for ipr i/f +options IPR_VJ +# enable logging of the first n IP packets to isdnd (n=32 here) +options IPR_LOG=32 +# +# network driver for sync PPP over ISDN; requires an equivalent +# number of sppp device to be configured +#XXX#device "i4bisppp" 4 +# +# B-channel interface to the netgraph subsystem +#XXX#device "i4bing" 2 +# +#--------------------------------------------------------------------------- # # Set the number of PV entries per process. Increasing this can -# stop panics related to heavy use of shared memory. However, that can +# stop panics related to heavy use of shared memory. However, that can # (combined with large amounts of physical memory) cause panics at # boot time due the kernel running out of VM space. # ==== //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.48 2004/02/16 02:50:03 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.49 2004/03/04 00:17:14 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -1559,6 +1559,7 @@ cur = (ndis_packet *)*pool; cur->np_private.npp_flags = 0x1; /* mark the head of the list */ + cur->np_private.npp_totlen = 0; /* init deletetion flag */ for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) { cur->np_private.npp_head = (ndis_handle)(cur + 1); cur++; @@ -1595,7 +1596,21 @@ ndis_free_packetpool(pool) ndis_handle pool; { - free(pool, M_DEVBUF); + ndis_packet *head; + + head = pool; + + /* Mark this pool as 'going away.' */ + + head->np_private.npp_totlen = 1; + + /* If there are no buffers loaned out, destroy the pool. */ + + if (head->np_private.npp_count == 0) + free(pool, M_DEVBUF); + else + printf("NDIS: buggy driver deleting active packet pool!\n"); + return; } @@ -1614,6 +1629,16 @@ return; } + /* + * If this pool is marked as 'going away' don't allocate any + * more packets out of it. + */ + + if (head->np_private.npp_totlen) { + *status = NDIS_STATUS_FAILURE; + return; + } + pkt = (ndis_packet *)head->np_private.npp_head; if (pkt == NULL) { @@ -1662,6 +1687,14 @@ head->np_private.npp_head = (ndis_buffer *)packet; head->np_private.npp_count--; + /* + * If the pool has been marked for deletion and there are + * no more packets outstanding, nuke the pool. + */ + + if (head->np_private.npp_totlen && head->np_private.npp_count == 0) + free(head, M_DEVBUF); + return; } @@ -1749,6 +1782,8 @@ cur = (ndis_buffer *)*pool; cur->nb_flags = 0x1; /* mark the head of the list */ + cur->nb_bytecount = 0; /* init usage count */ + cur->nb_byteoffset = 0; /* init deletetion flag */ for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) { cur->nb_next = cur + 1; cur++; @@ -1762,7 +1797,20 @@ ndis_free_bufpool(pool) ndis_handle pool; { - free(pool, M_DEVBUF); + ndis_buffer *head; + + head = pool; + + /* Mark this pool as 'going away.' */ + + head->nb_byteoffset = 1; + + /* If there are no buffers loaned out, destroy the pool. */ + if (head->nb_bytecount == 0) + free(pool, M_DEVBUF); + else + printf("NDIS: buggy driver deleting active buffer pool!\n"); + return; } @@ -1785,6 +1833,16 @@ return; } + /* + * If this pool is marked as 'going away' don't allocate any + * more buffers out of it. + */ + + if (head->nb_byteoffset) { + *status = NDIS_STATUS_FAILURE; + return; + } + buf = head->nb_next; if (buf == NULL) { @@ -1801,6 +1859,10 @@ *buffer = buf; + /* Increment count of busy buffers. */ + + head->nb_bytecount++; + *status = NDIS_STATUS_SUCCESS; return; } @@ -1822,6 +1884,18 @@ buf->nb_next = head->nb_next; head->nb_next = buf; + /* Decrement count of busy buffers. */ + + head->nb_bytecount--; + + /* + * If the pool has been marked for deletion and there are + * no more buffers outstanding, nuke the pool. + */ + + if (head->nb_byteoffset && head->nb_bytecount == 0) + free(head, M_DEVBUF); + return; } ==== //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.23 2004/02/17 21:50:39 wpaul Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:01:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59F8816A4D0; Wed, 3 Mar 2004 22:01:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 357A116A4CE for ; Wed, 3 Mar 2004 22:01:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19DC943D3F for ; Wed, 3 Mar 2004 22:01:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i24613Ge011289 for ; Wed, 3 Mar 2004 22:01:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24613JC011286 for perforce@freebsd.org; Wed, 3 Mar 2004 22:01:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:01:03 -0800 (PST) Message-Id: <200403040601.i24613JC011286@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 48107 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, 04 Mar 2004 06:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=48107 Change 48107 by peter@peter_daintree on 2004/03/03 22:00:03 no way does this MI shit belong here. move it somewhere that it doesn't have to have a copy in each MD platform area. Affected files ... .. //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:05:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8317916A4D0; Wed, 3 Mar 2004 22:05:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44C8016A4CE for ; Wed, 3 Mar 2004 22:05:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A45A43D41 for ; Wed, 3 Mar 2004 22:05:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2465AGe013940 for ; Wed, 3 Mar 2004 22:05:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24659Sf013937 for perforce@freebsd.org; Wed, 3 Mar 2004 22:05:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:05:09 -0800 (PST) Message-Id: <200403040605.i24659Sf013937@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 48109 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, 04 Mar 2004 06:05:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48109 Change 48109 by peter@peter_daintree on 2004/03/03 22:04:44 exterminate proliferation of duplicate MI headers in MD include area with extreme prejudice. Affected files ... .. //depot/projects/hammer/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/hammer/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#3 edit .. //depot/projects/hammer/sys/dev/ct/ct.c#3 edit .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#6 edit .. //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#3 edit .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#7 edit .. //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#2 edit .. //depot/projects/hammer/sys/dev/nsp/nsp.c#4 edit .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#5 edit .. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#4 edit .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#7 edit .. //depot/projects/hammer/sys/i386/include/dvcfg.h#2 delete .. //depot/projects/hammer/sys/i386/include/physio_proc.h#3 delete Differences ... ==== //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#3 (text+ko) ==== @@ -78,8 +78,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/dev/ct/ct.c#3 (text+ko) ==== @@ -76,8 +76,8 @@ #ifdef __FreeBSD__ #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/dev/ct/ct_isa.c#6 (text+ko) ==== @@ -81,8 +81,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#3 (text+ko) ==== @@ -79,8 +79,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include -#include +#include #include ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ #ifndef __NCR53C500HW_H_ #define __NCR53C500HW_H_ -#include +#include #define NCV_HOSTID 7 #define NCV_NTARGETS 8 ==== //depot/projects/hammer/sys/dev/nsp/nsp.c#4 (text+ko) ==== @@ -79,8 +79,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#5 (text+ko) ==== @@ -44,8 +44,8 @@ #include -#include -#include +#include +#include #include ==== //depot/projects/hammer/sys/dev/stg/tmc18c30.c#4 (text+ko) ==== @@ -77,8 +77,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#7 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include -#include +#include #include From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:07:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62DFA16A4D0; Wed, 3 Mar 2004 22:07:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DD8A16A4CE for ; Wed, 3 Mar 2004 22:07:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3950C43D2F for ; Wed, 3 Mar 2004 22:07:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2467DGe014063 for ; Wed, 3 Mar 2004 22:07:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2467CSJ014060 for perforce@freebsd.org; Wed, 3 Mar 2004 22:07:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:07:12 -0800 (PST) Message-Id: <200403040607.i2467CSJ014060@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 48110 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, 04 Mar 2004 06:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48110 Change 48110 by peter@peter_daintree on 2004/03/03 22:06:59 update include guards Affected files ... .. //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#2 edit .. //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#2 edit Differences ... ==== //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#2 (text+ko) ==== @@ -32,8 +32,8 @@ * Copyright (c) 1996 Naofumi HONDA. All rights reserved. */ -#ifndef _AMD64_DVCFG_H_ -#define _AMD64_DVCFG_H_ +#ifndef _COMPAT_NETBSD_DVCFG_H_ +#define _COMPAT_NETBSD_DVCFG_H_ typedef void *dvcfg_hw_t; @@ -62,4 +62,4 @@ } #define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM)) -#endif /* _AMD64_DVCFG_H_ */ +#endif /* _COMPAT_NETBSD_DVCFG_H_ */ ==== //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#2 (text+ko) ==== @@ -30,8 +30,8 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_PHYSIO_PROC_H_ -#define _AMD64_PHYSIO_PROC_H_ +#ifndef _COMPAT_NETBSD_PHYSIO_PROC_H_ +#define _COMPAT_NETBSD_PHYSIO_PROC_H_ #include struct buf; @@ -54,4 +54,4 @@ struct physio_proc *pp; { } -#endif /* _AMD64_PHYSIO_PROC_H_ */ +#endif /* _COMPAT_NETBSD_PHYSIO_PROC_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:12:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D8216A4D0; Wed, 3 Mar 2004 22:12:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1E9216A4CE for ; Wed, 3 Mar 2004 22:12:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECDBF43D1F for ; Wed, 3 Mar 2004 22:12:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246CJGe015802 for ; Wed, 3 Mar 2004 22:12:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246CJpV015796 for perforce@freebsd.org; Wed, 3 Mar 2004 22:12:19 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:12:19 -0800 (PST) Message-Id: <200403040612.i246CJpV015796@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 48111 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, 04 Mar 2004 06:12:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=48111 Change 48111 by peter@peter_daintree on 2004/03/03 22:12:05 fix some text merge problems Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#6 (text+ko) ==== @@ -107,9 +107,8 @@ # calibration to be repeated.) options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - +# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 +# clock to actually be used. options CLK_USE_I8254_CALIBRATION From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:13:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1870D16A4D0; Wed, 3 Mar 2004 22:13:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E58FB16A4CE for ; Wed, 3 Mar 2004 22:13:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9BC543D1F for ; Wed, 3 Mar 2004 22:13:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246DLGe015957 for ; Wed, 3 Mar 2004 22:13:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246DLgM015954 for perforce@freebsd.org; Wed, 3 Mar 2004 22:13:21 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:13:21 -0800 (PST) Message-Id: <200403040613.i246DLgM015954@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 48112 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, 04 Mar 2004 06:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=48112 Change 48112 by peter@peter_daintree on 2004/03/03 22:12:27 Umm. VESA doesn't exist on amd64. Sorry David. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#7 (text+ko) ==== @@ -171,12 +171,6 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION -# To include support for VGA VESA video modes -options VESA - -# Turn on extra debugging checks and output for VESA support. -options VESA_DEBUG - # # Optional devices: # From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:32:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867C816A4D0; Wed, 3 Mar 2004 22:32:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AEE316A4CE for ; Wed, 3 Mar 2004 22:32:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 458C143D3F for ; Wed, 3 Mar 2004 22:32:50 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246WjGe020007 for ; Wed, 3 Mar 2004 22:32:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246WjMM020004 for perforce@freebsd.org; Wed, 3 Mar 2004 22:32:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:32:45 -0800 (PST) Message-Id: <200403040632.i246WjMM020004@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 48113 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, 04 Mar 2004 06:32:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=48113 Change 48113 by peter@peter_daintree on 2004/03/03 22:32:00 sync with i386 version some more. some notes: pecoff doesn't compile, its not even in files.amd64. stl is a lost cause. I reread it, it needs major surgery, not a mere splitup. It uses the old pci and the old isa shims and does inline i386 asm. (ie: its a linux driver beaten up to compile on freebsd) correct some comments and fix some merge glitches from before, and fix some gratuitous whitespace etc changes relative to i386. I think I can now force integrate this to get a p4 baseline tracking record for the i386_hammer branch. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -184,18 +184,6 @@ # config as well, or you will not have the dependencies. The other option # is to load both as modules. -device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support - -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. -# -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - device tdfx # Enable 3Dfx Voodoo support #X#options TDFX_LINUX # Enable Linuxulator support @@ -248,16 +236,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) #X#device ath #X#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -274,7 +263,6 @@ # ncv: NCR 53C500 based SCSI host adapters. # nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # stg: TMC 18C30, 18C50 based SCSI host adapters. -# device ncv device nsp @@ -305,8 +293,6 @@ # # cy: Cyclades serial driver # digi: Digiboard driver -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -314,6 +300,8 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. +device cy 1 +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -326,8 +314,6 @@ device digi_Xe device digi_Xem device digi_Xr -#XXX# PCI versions exist, but driver needs to be moved and split up. -#XXX#device stl # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -372,7 +358,6 @@ # PCI bus Cards: # -------------- # -# # ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) options ELSA_QS1PCI # From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:33:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2100216A4D0; Wed, 3 Mar 2004 22:33:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF6C816A4CE for ; Wed, 3 Mar 2004 22:33:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D375343D3F for ; Wed, 3 Mar 2004 22:33:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246XlGe020032 for ; Wed, 3 Mar 2004 22:33:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246XlQx020029 for perforce@freebsd.org; Wed, 3 Mar 2004 22:33:47 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:33:47 -0800 (PST) Message-Id: <200403040633.i246XlQx020029@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 48114 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, 04 Mar 2004 06:33:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=48114 Change 48114 by peter@peter_daintree on 2004/03/03 22:32:58 set a baseline indirect integration marker Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Mar 3 22:34:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD0FF16A4D0; Wed, 3 Mar 2004 22:34:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F3A416A4CE for ; Wed, 3 Mar 2004 22:34:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74EEA43D3F for ; Wed, 3 Mar 2004 22:34:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i246YnGe020075 for ; Wed, 3 Mar 2004 22:34:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i246YnDU020072 for perforce@freebsd.org; Wed, 3 Mar 2004 22:34:49 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Mar 2004 22:34:49 -0800 (PST) Message-Id: <200403040634.i246YnDU020072@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 48115 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, 04 Mar 2004 06:34:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=48115 Change 48115 by peter@peter_daintree on 2004/03/03 22:34:36 IFC @48108 Affected files ... .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#15 integrate Differences ... ==== //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#8 (text+ko) ==== @@ -119,10 +119,17 @@ /* * Some systems' ASL may have problems because they look for names - * of Microsoft operating systems. To override this, set hw.acpi.os_name - * to the appropriate string. + * of Microsoft operating systems. We default to "Microsoft Windows NT" + * (aka NT5 or Windows 2000) because it is most similar to our + * implementation and also most prevalent. + * + * To override this, set hw.acpi.os_name to the appropriate string. */ +#ifndef ACPICA_PEDANTIC +#define ACPI_OS_NAME "Microsoft Windows NT" +#else #define ACPI_OS_NAME "FreeBSD" +#endif /* FreeBSD uses GCC */ ==== //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#15 (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_ec.c,v 1.43 2004/03/03 18:34:42 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.44 2004/03/04 05:58:50 njl Exp $ */ /****************************************************************************** * @@ -137,7 +137,7 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.43 2004/03/03 18:34:42 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.44 2004/03/04 05:58:50 njl Exp $"); #include "opt_acpi.h" #include @@ -713,28 +713,33 @@ ACPI_INTEGER *Value, void *Context, void *RegionContext) { struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; - ACPI_STATUS Status = AE_OK; + ACPI_STATUS Status; UINT8 EcAddr, EcData; int i; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address); - if (Address > 0xFF || width % 8 != 0 || Value == NULL || Context == NULL) + if (width % 8 != 0 || Value == NULL || Context == NULL) return_ACPI_STATUS (AE_BAD_PARAMETER); + if (Address + (width / 8) - 1 > 0xFF) + return_ACPI_STATUS (AE_BAD_ADDRESS); - /* - * Perform the transaction. - */ + if (Function == ACPI_READ) + *Value = 0; EcAddr = Address; - for (i = 0; i < width; i += 8) { + Status = AE_ERROR; + + /* Perform the transaction(s), based on width. */ + for (i = 0; i < width; i += 8, EcAddr++) { Status = EcLock(sc); if (ACPI_FAILURE(Status)) - return (Status); + break; switch (Function) { case ACPI_READ: - EcData = 0; Status = EcRead(sc, EcAddr, &EcData); + if (ACPI_SUCCESS(Status)) + *Value |= ((ACPI_INTEGER)EcData) << i; break; case ACPI_WRITE: EcData = (UINT8)((*Value) >> i); @@ -746,15 +751,11 @@ Status = AE_BAD_PARAMETER; break; } - EcUnlock(sc); if (ACPI_FAILURE(Status)) - return (Status); + break; + } - *Value |= (ACPI_INTEGER)EcData << i; - if (++EcAddr == 0) - return_ACPI_STATUS (AE_BAD_PARAMETER); - } return_ACPI_STATUS (Status); } From owner-p4-projects@FreeBSD.ORG Thu Mar 4 00:14:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 900DD16A4D0; Thu, 4 Mar 2004 00:14:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5ADDE16A4CE; Thu, 4 Mar 2004 00:14:39 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE10543D49; Thu, 4 Mar 2004 00:14:38 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id i248Eckj087956; Thu, 4 Mar 2004 01:14:38 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 04 Mar 2004 01:47:36 -0700 (MST) Message-Id: <20040304.014736.66275231.imp@bsdimp.com> To: peter@freebsd.org From: "M. Warner Losh" In-Reply-To: <200403040632.i246WjMM020004@repoman.freebsd.org> References: <200403040632.i246WjMM020004@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 48113 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, 04 Mar 2004 08:14:40 -0000 In message: <200403040632.i246WjMM020004@repoman.freebsd.org> Peter Wemm writes: : stl is a lost cause. I reread it, it needs major surgery, not : a mere splitup. It uses the old pci and the old isa shims and : does inline i386 asm. (ie: its a linux driver beaten up to : compile on freebsd) Actually, there's no i386 asm that I saw in this driver when I was doing the conversion. It is not a linux driver converted to FreeBSD, it was written natively for lots of BSDs and hasn't been kept up to date (the Stallion Linux driver is terrible in comparison). I'll grant that it does use the old shim code, which is why I became interested in it (and why I've started a conversion for it). Warner From owner-p4-projects@FreeBSD.ORG Thu Mar 4 08:53:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A090716A4D1; Thu, 4 Mar 2004 08:53:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C42516A4CE for ; Thu, 4 Mar 2004 08:53:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60DB543D1F for ; Thu, 4 Mar 2004 08:53:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i24Gr4Ge075941 for ; Thu, 4 Mar 2004 08:53:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24Gr3dF075938 for perforce@freebsd.org; Thu, 4 Mar 2004 08:53:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 08:53:03 -0800 (PST) Message-Id: <200403041653.i24Gr3dF075938@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 48152 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, 04 Mar 2004 16:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=48152 Change 48152 by peter@peter_daintree on 2004/03/04 08:52:40 fix a bit of over-aggressive search/replace Affected files ... .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #include -#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Mar 4 08:54:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F99716A4D0; Thu, 4 Mar 2004 08:54:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7AE4616A4CE for ; Thu, 4 Mar 2004 08:54:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F69543D39 for ; Thu, 4 Mar 2004 08:54:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i24Gs6Ge075975 for ; Thu, 4 Mar 2004 08:54:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24Gs5mh075972 for perforce@freebsd.org; Thu, 4 Mar 2004 08:54:05 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 08:54:05 -0800 (PST) Message-Id: <200403041654.i24Gs5mh075972@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 48153 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, 04 Mar 2004 16:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=48153 Change 48153 by peter@peter_daintree on 2004/03/04 08:53:26 PECOFF_* does nothing, but that was hidden by these bogo-options Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#21 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#21 (text+ko) ==== @@ -15,8 +15,6 @@ COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h From owner-p4-projects@FreeBSD.ORG Thu Mar 4 08:55:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D13116A4D0; Thu, 4 Mar 2004 08:55:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67EBF16A4CE for ; Thu, 4 Mar 2004 08:55:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 634E943D45 for ; Thu, 4 Mar 2004 08:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i24Gt8Ge076014 for ; Thu, 4 Mar 2004 08:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24Gt7U3076011 for perforce@freebsd.org; Thu, 4 Mar 2004 08:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 08:55:07 -0800 (PST) Message-Id: <200403041655.i24Gt7U3076011@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 48154 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, 04 Mar 2004 16:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48154 Change 48154 by peter@peter_daintree on 2004/03/04 08:54:48 turn PECOFF bogo-options back off. Comment out cy since its the i386 isa version. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#10 (text+ko) ==== @@ -300,8 +300,8 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#X#device cy 1 +#X#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -501,7 +501,7 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev # PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT +#X#options PECOFF_SUPPORT # only knows 32 bit file format #X#options PECOFF_DEBUG options ENABLE_ALART From owner-p4-projects@FreeBSD.ORG Thu Mar 4 12:04:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB5B816A4D0; Thu, 4 Mar 2004 12:04:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D96D16A4CE for ; Thu, 4 Mar 2004 12:04:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9670943D1F for ; Thu, 4 Mar 2004 12:04:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i24K40Ge018738 for ; Thu, 4 Mar 2004 12:04:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i24K3xlD018733 for perforce@freebsd.org; Thu, 4 Mar 2004 12:03:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 Mar 2004 12:03:59 -0800 (PST) Message-Id: <200403042003.i24K3xlD018733@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 48160 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, 04 Mar 2004 20:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=48160 Change 48160 by rwatson@rwatson_tislabs on 2004/03/04 12:03:38 Integrate netperf_socket branch: - ACPI hacks and fixes. - A variety of ATA fixes and fun. - LINT fixes. - USB vendor IDs - Style and comment fixes for accounting, fork, file descriptor, VM code. - IPv6 multicast code moves entirely into mld. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES.fixed#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_tc.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/mld6.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/filedesc.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#3 (text+ko) ==== @@ -119,10 +119,17 @@ /* * Some systems' ASL may have problems because they look for names - * of Microsoft operating systems. To override this, set hw.acpi.os_name - * to the appropriate string. + * of Microsoft operating systems. We default to "Microsoft Windows NT" + * (aka NT5 or Windows 2000) because it is most similar to our + * implementation and also most prevalent. + * + * To override this, set hw.acpi.os_name to the appropriate string. */ +#ifndef ACPICA_PEDANTIC +#define ACPI_OS_NAME "Microsoft Windows NT" +#else #define ACPI_OS_NAME "FreeBSD" +#endif /* FreeBSD uses GCC */ ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#4 (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.122 2004/03/03 18:34:42 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.123 2004/03/04 04:42:59 njl Exp $ */ #include "opt_acpi.h" @@ -262,6 +262,8 @@ /* Set up any quirks we have for this XSDT. */ acpi_quirks_set(); + if (acpi_disabled("acpi")) + return_VALUE (AE_ERROR); return_VALUE (AE_OK); } @@ -283,9 +285,6 @@ if (resource_disabled("acpi", 0)) return_VOID; - snprintf(acpi_ca_version, sizeof(acpi_ca_version), "0x%x", - ACPI_CA_VERSION); - /* Make sure we're not being doubly invoked. */ if (device_find_child(parent, "acpi", 0) != NULL) return_VOID; @@ -294,6 +293,8 @@ if (ACPI_FAILURE(acpi_Startup())) return_VOID; + snprintf(acpi_ca_version, sizeof(acpi_ca_version), "%#x", ACPI_CA_VERSION); + /* Attach the actual ACPI device. */ if ((child = BUS_ADD_CHILD(parent, 0, "acpi", 0)) == NULL) { device_printf(parent, "ACPI: could not attach\n"); @@ -583,10 +584,19 @@ char *env, *tmp; int len; - /* If the user specifies "noquirks", leave the settings alone. */ + /* + * If the user loaded a custom table or disabled "quirks", leave + * the settings alone. + */ len = 0; + if ((env = getenv("acpi_dsdt_load")) != NULL) { + /* XXX No strcasecmp but this is good enough. */ + if (*env == 'Y' || *env == 'y') + goto out; + freeenv(env); + } if ((env = getenv("debug.acpi.disabled")) != NULL) { - if (strstr("noquirks", env) != NULL) + if (strstr("quirks", env) != NULL) goto out; len = strlen(env); } ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.29 2003/12/28 22:15:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.30 2004/03/04 05:17:52 njl Exp $"); #include "opt_acpi.h" #include @@ -394,8 +394,12 @@ /* If _PTC not present or other failure, try the P_BLK. */ if (sc->cpu_p_cnt == NULL) { - /* The spec says P_BLK must be at least 6 bytes long. */ - if (sc->cpu_p_blk == 0 || sc->cpu_p_blk_len != 6) + /* + * The spec says P_BLK must be 6 bytes long. However, some + * systems use it to indicate a fractional set of features + * present so we take anything >= 4. + */ + if (sc->cpu_p_blk_len < 4) return (ENXIO); gas.Address = sc->cpu_p_blk; gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; @@ -447,7 +451,14 @@ cx_ptr++; sc->cpu_cx_count++; - if (sc->cpu_p_blk_len != 6) + /* + * The spec says P_BLK must be 6 bytes long. However, some systems + * use it to indicate a fractional set of features present so we + * take 5 as C2. Some may also have a value of 7 to indicate + * another C3 but most use _CST for this (as required) and having + * "only" C1-C3 is not a hardship. + */ + if (sc->cpu_p_blk_len < 5) goto done; /* Validate and allocate resources for C2 (P_LVL2). */ @@ -465,6 +476,8 @@ sc->cpu_cx_count++; } } + if (sc->cpu_p_blk_len < 6) + goto done; /* Validate and allocate resources for C3 (P_LVL3). */ if (AcpiGbl_FADT->Plvl3Lat < 1000 && ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#3 (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_ec.c,v 1.43 2004/03/03 18:34:42 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.44 2004/03/04 05:58:50 njl Exp $ */ /****************************************************************************** * @@ -137,7 +137,7 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.43 2004/03/03 18:34:42 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.44 2004/03/04 05:58:50 njl Exp $"); #include "opt_acpi.h" #include @@ -713,28 +713,33 @@ ACPI_INTEGER *Value, void *Context, void *RegionContext) { struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; - ACPI_STATUS Status = AE_OK; + ACPI_STATUS Status; UINT8 EcAddr, EcData; int i; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address); - if (Address > 0xFF || width % 8 != 0 || Value == NULL || Context == NULL) + if (width % 8 != 0 || Value == NULL || Context == NULL) return_ACPI_STATUS (AE_BAD_PARAMETER); + if (Address + (width / 8) - 1 > 0xFF) + return_ACPI_STATUS (AE_BAD_ADDRESS); - /* - * Perform the transaction. - */ + if (Function == ACPI_READ) + *Value = 0; EcAddr = Address; - for (i = 0; i < width; i += 8) { + Status = AE_ERROR; + + /* Perform the transaction(s), based on width. */ + for (i = 0; i < width; i += 8, EcAddr++) { Status = EcLock(sc); if (ACPI_FAILURE(Status)) - return (Status); + break; switch (Function) { case ACPI_READ: - EcData = 0; Status = EcRead(sc, EcAddr, &EcData); + if (ACPI_SUCCESS(Status)) + *Value |= ((ACPI_INTEGER)EcData) << i; break; case ACPI_WRITE: EcData = (UINT8)((*Value) >> i); @@ -746,15 +751,11 @@ Status = AE_BAD_PARAMETER; break; } - EcUnlock(sc); if (ACPI_FAILURE(Status)) - return (Status); + break; + } - *Value |= (ACPI_INTEGER)EcData << i; - if (++EcAddr == 0) - return_ACPI_STATUS (AE_BAD_PARAMETER); - } return_ACPI_STATUS (Status); } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.62 2004/02/25 09:55:49 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.63 2004/03/04 16:39:59 sos Exp $"); #include "opt_ata.h" #include @@ -1714,14 +1714,15 @@ ch->r_io[ATA_BMDEVSPEC_1].offset = 0x100 + (unit01 << 7) + (unit10 << 9); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; - if (ctlr->chip->max_dma >= ATA_SA150) + if (ctlr->chip->max_dma >= ATA_SA150) { ch->flags |= ATA_NO_SLAVE; + ch->reset = ata_sii_reset; + } ctlr->dmainit(ch); if (ctlr->chip->cfg2 & SIIBUG) ch->dma->boundary = 8 * 1024; - ch->reset = ata_sii_reset; return 0; } ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.33 2004/02/11 10:14:08 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.34 2004/03/04 15:37:39 thomas Exp $"); #include #include @@ -556,7 +556,7 @@ csio = &hcb->ccb->csio; #ifdef CAMDEBUG -# define err (request->error) +# define err (request->u.atapi.sense_key) if (CAM_DEBUGGED(csio->ccb_h.path, CAM_DEBUG_CDB)) { printf("atapi_cb: hcb@%p error = %02x: (sk = %02x%s%s%s)\n", hcb, err, err >> 4, @@ -579,6 +579,7 @@ csio->scsi_status = SCSI_STATUS_CHECK_COND; if ((csio->ccb_h.flags & CAM_DIS_AUTOSENSE) == 0) { +#if 0 static const int8_t ccb[16] = { ATAPI_REQUEST_SENSE, 0, 0, 0, sizeof(struct atapi_sense), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -595,6 +596,14 @@ mtx_unlock (&Giant); ata_queue_request(request); return; +#else + /* The ATA driver has already requested sense for us. */ + if (request->error == 0) { + /* The ATA autosense suceeded. */ + bcopy (&request->u.atapi.sense_data, &csio->sense_data, sizeof(struct atapi_sense)); + csio->ccb_h.status |= CAM_AUTOSNS_VALID; + } +#endif } } else { rc = CAM_REQ_CMP; ==== //depot/projects/netperf_socket/sys/dev/ctau/ctau.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * Cronyx Id: ctau.c,v 1.1.2.4 2003/12/11 17:33:43 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/ctau.c,v 1.1 2004/02/23 20:19:00 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/ctau.c,v 1.2 2004/03/04 14:16:12 bms Exp $"); #include #include @@ -151,7 +151,7 @@ outb (bcr1_port, bcr1); \ dclk_tick (b); } -#define DEBUG(x) /*trace_str x*/ +#define CTAU_DEBUG(x) /*trace_str x*/ int ct_download2 (port_t port, const unsigned char *fwaddr) { @@ -177,7 +177,7 @@ for (val=0; val<2*3; ++val) nconfig_clr(port); if (nstatus(port)) { - DEBUG (("Bad nstatus, downloading aborted (bsr3=0x%x).\n", inb(BSR3(port)))); + CTAU_DEBUG (("Bad nstatus, downloading aborted (bsr3=0x%x).\n", inb(BSR3(port)))); nconfig_set(port); return 0; } @@ -199,7 +199,7 @@ val = unpack_getchar (&t); if (nstatus(port) == 0) { - DEBUG (("Bad nstatus, %d bytes remaining.\n", bytes)); + CTAU_DEBUG (("Bad nstatus, %d bytes remaining.\n", bytes)); goto failed; } @@ -209,13 +209,13 @@ dclk_tick (port); if (nstatus(port) == 0) { - DEBUG (("Bad nstatus after confdone, %d bytes remaining (%d).\n", + CTAU_DEBUG (("Bad nstatus after confdone, %d bytes remaining (%d).\n", bytes, t.ptr - fwaddr)); goto failed; } /* Succeeded. */ - /*DEBUG (("Download succeeded.\n"));*/ + /*CTAU_DEBUG (("Download succeeded.\n"));*/ return 1; } @@ -231,9 +231,9 @@ /* if ((bytes & 1023) == 0) putch ('.'); */ } - DEBUG (("Bad confdone.\n")); + CTAU_DEBUG (("Bad confdone.\n")); failed: - DEBUG (("Downloading aborted.\n")); + CTAU_DEBUG (("Downloading aborted.\n")); return 0; } ==== //depot/projects/netperf_socket/sys/dev/usb/umass.c#3 (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/usb/umass.c,v 1.103 2004/02/06 14:38:14 sanpei Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.104 2004/03/04 07:20:48 sanpei Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -381,6 +381,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, WRONG_CSWSIG }, + { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100, RID_WILDCARD, + UMASS_PROTO_ATAPI | UMASS_PROTO_BBB, + NO_INQUIRY | NO_GETMAXLUN + }, { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB20AN, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.164 2004/03/02 19:01:30 peter Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -272,6 +272,7 @@ vendor MICROTECH 0x07af Microtech vendor GENERALINSTMNTS 0x07b2 General Instruments (Motorola) vendor OLYMPUS 0x07b4 Olympus +vendor ONSPEC 0x07c4 OnSpec Electronic vendor ABOCOM 0x07b8 AboCom Systems vendor KEISOKUGIKEN 0x07c1 Keisokugiken vendor APG 0x07c5 APG Cash Drawer @@ -1015,6 +1016,9 @@ product OMNIVISION OV511 0x0511 OV511 Camera product OMNIVISION OV511PLUS 0xa511 OV511+ Camera +/* OnSpec Electronic, Inc. */ +product ONSPEC UCF100 0xa400 FlashLink UCF-100 CompactFlash Reader + /* Palm Computing, Inc. product */ product PALM SERIAL 0x0080 USB Serial Adaptor product PALM M500 0x0001 Palm m500 ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#4 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.171 2004/03/02 19:01:56 peter Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.164 2004/03/02 19:01:30 peter Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp */ /* @@ -279,6 +279,7 @@ #define USB_VENDOR_MICROTECH 0x07af /* Microtech */ #define USB_VENDOR_GENERALINSTMNTS 0x07b2 /* General Instruments (Motorola) */ #define USB_VENDOR_OLYMPUS 0x07b4 /* Olympus */ +#define USB_VENDOR_ONSPEC 0x07c4 /* OnSpec Electronic */ #define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems */ #define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken */ #define USB_VENDOR_APG 0x07c5 /* APG Cash Drawer */ @@ -1022,6 +1023,9 @@ #define USB_PRODUCT_OMNIVISION_OV511 0x0511 /* OV511 Camera */ #define USB_PRODUCT_OMNIVISION_OV511PLUS 0xa511 /* OV511+ Camera */ +/* OnSpec Electronic, Inc. */ +#define USB_PRODUCT_ONSPEC_UCF100 0xa400 /* FlashLink UCF-100 CompactFlash Reader */ + /* Palm Computing, Inc. product */ #define USB_PRODUCT_PALM_SERIAL 0x0080 /* USB Serial Adaptor */ #define USB_PRODUCT_PALM_M500 0x0001 /* Palm m500 */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#4 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.171 2004/03/02 19:01:56 peter Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.164 2004/03/02 19:01:30 peter Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp */ /* @@ -2332,6 +2332,12 @@ "OV511+ Camera", }, { + USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100, + 0, + "OnSpec Electronic", + "FlashLink UCF-100 CompactFlash Reader", + }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL, 0, "Palm Computing", @@ -4546,6 +4552,12 @@ NULL, }, { + USB_VENDOR_ONSPEC, 0, + USB_KNOWNDEV_NOPROD, + "OnSpec Electronic", + NULL, + }, + { USB_VENDOR_ABOCOM, 0, USB_KNOWNDEV_NOPROD, "AboCom Systems", ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Pawel Jakub Dawidek + * Copyright (c) 2004 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.4 2004/03/03 22:29:24 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.5 2004/03/04 10:22:42 pjd Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Pawel Jakub Dawidek + * Copyright (c) 2004 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.4 2004/03/03 22:29:24 pjd Exp $ + * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.5 2004/03/04 10:22:42 pjd Exp $ */ #ifndef _G_CONCAT_H_ ==== //depot/projects/netperf_socket/sys/kern/kern_acct.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.69 2004/02/04 21:52:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.70 2004/03/04 09:47:09 bde Exp $"); #include "opt_mac.h" @@ -137,6 +137,7 @@ return (error); mtx_lock(&Giant); + /* * If accounting is to be started to a file, open that file for * appending and make sure it's a 'normal'. @@ -169,16 +170,14 @@ #endif } + mtx_lock(&acct_mtx); + /* * If accounting was previously enabled, kill the old space-watcher, * close the file, and (if no new file was specified, leave). - */ - - /* - * XXX arr: Should not hold lock over vnode operation. + * + * XXX arr: should not hold lock over vnode operation. */ - - mtx_lock(&acct_mtx); if (acctp != NULLVP || savacctp != NULLVP) { callout_stop(&acctwatch_callout); error = vn_close((acctp != NULLVP ? acctp : savacctp), @@ -205,6 +204,7 @@ mtx_unlock(&acct_mtx); log(LOG_NOTICE, "Accounting enabled\n"); acctwatch(NULL); + done2: mtx_unlock(&Giant); return (error); @@ -216,19 +216,18 @@ * and are enumerated below. (They're also noted in the system * "acct.h" header file.) */ - int acct_process(td) struct thread *td; { - struct proc *p = td->td_proc; struct acct acct; + struct timeval ut, st, tmp; + struct plimit *newlim, *oldlim; + struct proc *p; struct rusage *r; - struct timeval ut, st, tmp; + struct ucred *uc; + struct vnode *vp; int t, ret; - struct vnode *vp; - struct ucred *uc; - struct plimit *newlim, *oldlim; mtx_lock(&acct_mtx); @@ -239,6 +238,8 @@ return (0); } + p = td->td_proc; + /* * Get process accounting information. */ @@ -292,7 +293,7 @@ PROC_UNLOCK(p); /* - * Write the accounting information to the file. + * Finish doing things that require acct_mtx, and release acct_mtx. */ uc = crhold(acctcred); vref(vp); @@ -310,6 +311,9 @@ PROC_UNLOCK(p); lim_free(oldlim); + /* + * Write the accounting information to the file. + */ VOP_LEASE(vp, td, uc, LEASE_WRITE); ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)&acct, sizeof (acct), (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, uc, NOCRED, @@ -374,10 +378,9 @@ mtx_lock(&acct_mtx); /* - * XXX arr: Need to fix the issue of holding acct_mtx over + * XXX arr: need to fix the issue of holding acct_mtx over * the below vnode operations. */ - if (savacctp != NULLVP) { if (savacctp->v_type == VBAD) { (void) vn_close(savacctp, savacctflags, savacctcred, ==== //depot/projects/netperf_socket/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.215 2004/02/26 00:27:02 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.216 2004/03/04 09:56:29 bde Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -134,12 +134,13 @@ struct thread *td; struct rfork_args *uap; { + struct proc *p2; int error; - struct proc *p2; - /* Don't allow kernel only flags. */ + /* Don't allow kernel-only flags. */ if ((uap->flags & RFKERNELONLY) != 0) return (EINVAL); + error = fork1(td, uap->flags, 0, &p2); if (error == 0) { td->td_retval[0] = p2 ? p2->p_pid : 0; @@ -236,7 +237,7 @@ } /* - * Unshare file descriptors (from parent.) + * Unshare file descriptors (from parent). */ if (flags & RFFDG) { FILEDESC_LOCK(p1->p_fd); @@ -271,7 +272,7 @@ */ PROC_LOCK(p1); if (thread_single(SINGLE_NO_EXIT)) { - /* Abort.. someone else is single threading before us */ + /* Abort. Someone else is single threading before us. */ PROC_UNLOCK(p1); mtx_unlock(&Giant); return (ERESTART); @@ -458,7 +459,7 @@ kg2 = FIRST_KSEGRP_IN_PROC(p2); ke2 = FIRST_KSE_IN_KSEGRP(kg2); - /* Allocate and switch to an alternate kstack if specified */ + /* Allocate and switch to an alternate kstack if specified. */ if (pages != 0) vm_thread_new_altkstack(td2, pages); @@ -532,16 +533,16 @@ p2->p_fdtol = fdtol; /* - * p_limit is copy-on-write, bump refcnt, + * p_limit is copy-on-write. Bump its refcount. */ p2->p_limit = lim_hold(p1->p_limit); PROC_UNLOCK(p1); PROC_UNLOCK(p2); /* - * Setup linkage for kernel based threading + * Set up linkage for kernel based threading. */ - if((flags & RFTHREAD) != 0) { + if ((flags & RFTHREAD) != 0) { mtx_lock(&ppeers_lock); p2->p_peers = p1->p_peers; p1->p_peers = p2; @@ -723,7 +724,7 @@ PROC_UNLOCK(p2); /* - * If other threads are waiting, let them continue now + * If other threads are waiting, let them continue now. */ if (p1->p_flag & P_SA) { PROC_LOCK(p1); ==== //depot/projects/netperf_socket/sys/kern/kern_tc.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.160 2004/01/22 19:50:06 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.161 2004/03/04 14:14:23 phk Exp $"); #include "opt_ntp.h" @@ -670,10 +670,6 @@ return; } - /* Return if nothing really happened. */ - if (*pcount == pps->capcount) - return; - /* Convert the count to a timespec. */ tcount = pps->capcount - pps->capth->th_offset_count; tcount &= pps->capth->th_counter->tc_counter_mask; ==== //depot/projects/netperf_socket/sys/netinet6/in6.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.c,v 1.44 2004/03/03 14:33:16 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.c,v 1.46 2004/03/04 15:07:42 ume Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /* @@ -1563,94 +1563,6 @@ } /* - * Add an address to the list of IP6 multicast addresses for a - * given interface. - */ -struct in6_multi * -in6_addmulti(maddr6, ifp, errorp) - struct in6_addr *maddr6; - struct ifnet *ifp; - int *errorp; -{ - struct in6_multi *in6m; - struct sockaddr_in6 sin6; - struct ifmultiaddr *ifma; - int s = splnet(); - - *errorp = 0; - - /* - * Call generic routine to add membership or increment - * refcount. It wants addresses in the form of a sockaddr, - * so we build one here (being careful to zero the unused bytes). - */ - bzero(&sin6, sizeof sin6); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof sin6; - sin6.sin6_addr = *maddr6; - *errorp = if_addmulti(ifp, (struct sockaddr *)&sin6, &ifma); - if (*errorp) { - splx(s); - return 0; - } - - /* - * If ifma->ifma_protospec is null, then if_addmulti() created - * a new record. Otherwise, we are done. - */ - if (ifma->ifma_protospec != 0) - return ifma->ifma_protospec; - - /* XXX - if_addmulti uses M_WAITOK. Can this really be called - at interrupt time? If so, need to fix if_addmulti. XXX */ - in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT); - if (in6m == NULL) { - splx(s); - return (NULL); - } - - bzero(in6m, sizeof *in6m); - in6m->in6m_addr = *maddr6; - in6m->in6m_ifp = ifp; - in6m->in6m_ifma = ifma; - ifma->ifma_protospec = in6m; - LIST_INSERT_HEAD(&in6_multihead, in6m, in6m_entry); - - /* - * Let MLD6 know that we have joined a new IPv6 multicast - * group. - */ - mld6_start_listening(in6m); - splx(s); - return (in6m); -} - -/* - * Delete a multicast address record. - */ -void -in6_delmulti(in6m) - struct in6_multi *in6m; -{ - struct ifmultiaddr *ifma = in6m->in6m_ifma; - int s = splnet(); - - if (ifma->ifma_refcount == 1) { - /* - * No remaining claims to this record; let MLD6 know - * that we are leaving the multicast group. - */ - mld6_stop_listening(in6m); - ifma->ifma_protospec = 0; - LIST_REMOVE(in6m, in6m_entry); - free(in6m, M_IPMADDR); - } - /* XXX - should be separate API for when we have an ifma? */ - if_delmulti(ifma->ifma_ifp, ifma->ifma_addr); - splx(s); -} - -/* * Find an IPv6 interface link-local address specific to an interface. */ struct in6_ifaddr * ==== //depot/projects/netperf_socket/sys/netinet6/mld6.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/mld6.c,v 1.15 2003/10/31 16:07:15 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/mld6.c,v 1.16 2004/03/04 15:07:42 ume Exp $ */ /* $KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $ */ /* @@ -78,6 +78,7 @@ #include #include #include +#include #include @@ -475,3 +476,95 @@ } } } + +/* + * Add an address to the list of IP6 multicast addresses for a given interface. + * Add source addresses to the list also, if upstream router is MLDv2 capable + * and the number of source is not 0. + */ +struct in6_multi * +in6_addmulti(maddr6, ifp, errorp) + struct in6_addr *maddr6; + struct ifnet *ifp; + int *errorp; +{ + struct in6_multi *in6m; + struct ifmultiaddr *ifma; + struct sockaddr_in6 sa6; + int s = splnet(); + + *errorp = 0; + + /* + * Call generic routine to add membership or increment + * refcount. It wants addresses in the form of a sockaddr, + * so we build one here (being careful to zero the unused bytes). + */ + bzero(&sa6, sizeof(sa6)); + sa6.sin6_family = AF_INET6; + sa6.sin6_len = sizeof(struct sockaddr_in6); + sa6.sin6_addr = *maddr6; + *errorp = if_addmulti(ifp, (struct sockaddr *)&sa6, &ifma); + if (*errorp) { + splx(s); + return 0; + } + + /* + * If ifma->ifma_protospec is null, then if_addmulti() created + * a new record. Otherwise, we are done. + */ + if (ifma->ifma_protospec != 0) { + splx(s); + return ifma->ifma_protospec; + } + + /* XXX - if_addmulti uses M_WAITOK. Can this really be called + at interrupt time? If so, need to fix if_addmulti. XXX */ + in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT); + if (in6m == NULL) { + splx(s); + return (NULL); + } + + bzero(in6m, sizeof *in6m); + in6m->in6m_addr = *maddr6; + in6m->in6m_ifp = ifp; + in6m->in6m_refcount = 1; + in6m->in6m_ifma = ifma; + ifma->ifma_protospec = in6m; + LIST_INSERT_HEAD(&in6_multihead, in6m, in6m_entry); + + /* + * Let MLD6 know that we have joined a new IPv6 multicast + * group. + */ + mld6_start_listening(in6m); + splx(s); + return (in6m); +} + +/* + * Delete a multicast address record. + */ +void +in6_delmulti(in6m) + struct in6_multi *in6m; +{ + struct ifmultiaddr *ifma = in6m->in6m_ifma; + int s = splnet(); + + if (ifma->ifma_refcount == 1) { + /* + * No remaining claims to this record; let MLD6 know + * that we are leaving the multicast group. + */ + mld6_stop_listening(in6m); + ifma->ifma_protospec = 0; + LIST_REMOVE(in6m, in6m_entry); + free(in6m, M_IPMADDR); + } + /* XXX - should be separate API for when we have an ifma? */ + if_delmulti(ifma->ifma_ifp, ifma->ifma_addr); + splx(s); +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 4 16:04:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49DE016A4D0; Thu, 4 Mar 2004 16:04:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 212E216A4CE for ; Thu, 4 Mar 2004 16:04:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16E8B43D2F for ; Thu, 4 Mar 2004 16:04:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2504dGe079084 for ; Thu, 4 Mar 2004 16:04:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2504deo079081 for perforce@freebsd.org; Thu, 4 Mar 2004 16:04:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 Mar 2004 16:04:39 -0800 (PST) Message-Id: <200403050004.i2504deo079081@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 48166 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, 05 Mar 2004 00:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=48166 Change 48166 by rwatson@rwatson_tislabs on 2004/03/04 16:04:36 Integ netperf_socket just to be sure; mostly NDIS. Affected files ... .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/ndis/Makefile#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.8 2004/02/16 02:50:03 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.9 2004/03/04 23:04:02 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -212,14 +212,35 @@ #define EVENT_TYPE_NOTIFY 0 #define EVENT_TYPE_SYNC 1 +/* + * We need to use the timeout()/untimeout() API for ktimers + * since timers can be initialized, but not destroyed (so + * malloc()ing our own callout structures would mean a leak, + * since there'd be no way to free() them). This means we + * need to use struct callout_handle, which is really just a + * pointer. To make it easier to deal with, we use a union + * to overlay the callout_handle over the k_timerlistentry. + * The latter is a list_entry, which is two pointers, so + * there's enough space available to hide a callout_handle + * there. + */ + struct ktimer { nt_dispatch_header k_header; uint64_t k_duetime; - list_entry k_timerlistentry; + union { + list_entry k_timerlistentry; + struct callout_handle k_handle; + } u; void *k_dpc; uint32_t k_period; }; +#define k_timerlistentry u.k_timerlistentry +#define k_handle u.k_handle + +typedef struct ktimer ktimer; + struct nt_kevent { nt_dispatch_header k_header; }; @@ -243,6 +264,8 @@ uint32_t *k_lock; }; +typedef struct kdpc kdpc; + /* * Note: the acquisition count is BSD-specific. The Microsoft * documentation says that mutexes can be acquired recursively @@ -256,13 +279,18 @@ */ struct kmutant { nt_dispatch_header km_header; - list_entry km_listentry; + union { + list_entry km_listentry; + uint32_t km_acquirecnt; + } u; void *km_ownerthread; uint8_t km_abandoned; uint8_t km_apcdisable; - uint32_t km_acquirecnt; }; +#define km_listentry u.km_listentry +#define km_acquirecnt u.km_acquirecnt + typedef struct kmutant kmutant; #define LOOKASIDE_DEPTH 256 ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.25 2004/03/04 00:17:14 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.26 2004/03/04 23:04:02 wpaul Exp $"); #include #include @@ -64,8 +64,6 @@ #include #include -#include "opt_ddb.h" - #define __regparm __attribute__((regparm(3))) #define FUNC void(*)(void) @@ -92,6 +90,15 @@ __stdcall static uint32_t ntoskrnl_read_event(nt_kevent *); __stdcall static uint32_t ntoskrnl_set_event(nt_kevent *, uint32_t, uint8_t); __stdcall static uint32_t ntoskrnl_reset_event(nt_kevent *); +static void ntoskrnl_timercall(void *); +__stdcall static void ntoskrnl_init_dpc(kdpc *, void *, void *); +__stdcall static void ntoskrnl_init_timer(ktimer *); +__stdcall static void ntoskrnl_init_timer_ex(ktimer *, uint32_t); +__stdcall static uint8_t ntoskrnl_set_timer(ktimer *, int64_t, kdpc *); +__stdcall static uint8_t ntoskrnl_set_timer_ex(ktimer *, int64_t, + uint32_t, kdpc *); +__stdcall static uint8_t ntoskrnl_cancel_timer(ktimer *); +__stdcall static uint8_t ntoskrnl_read_timer(ktimer *); __stdcall static void ntoskrnl_writereg_ushort(uint16_t *, uint16_t); __stdcall static uint16_t ntoskrnl_readreg_ushort(uint16_t *); __stdcall static void ntoskrnl_writereg_ulong(uint32_t *, uint32_t); @@ -1636,14 +1643,177 @@ __stdcall static void ntoskrnl_debugger(void) { -#ifdef DDB - Debugger("debug from winkernel module"); -#else - printf("ntoskrnl_debugger(): DDB not present\n"); -#endif + Debugger("ntoskrnl_debugger(): breakpoint"); + return; +} + +static void +ntoskrnl_timercall(arg) + void *arg; +{ + ktimer *timer; + __stdcall kdpc_func timerfunc; + kdpc *dpc; + struct timeval tv; + + timer = arg; + dpc = timer->k_dpc; + timerfunc = (kdpc_func)dpc->k_deferedfunc; + timerfunc(dpc, dpc->k_deferredctx, dpc->k_sysarg1, dpc->k_sysarg2); + + ntoskrnl_wakeup(&timer->k_header); + + /* + * If this is a periodic timer, re-arm it + * so it will fire again. + */ + + if (timer->k_period) { + tv.tv_sec = 0; + tv.tv_usec = timer->k_period * 1000; + timer->k_handle = + timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + } + + return; +} + +__stdcall static void +ntoskrnl_init_timer(timer) + ktimer *timer; +{ + if (timer == NULL) + return; + + INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead)); + timer->k_header.dh_sigstate = FALSE; + timer->k_header.dh_type = EVENT_TYPE_NOTIFY; + timer->k_header.dh_size = OTYPE_TIMER; + callout_handle_init(&timer->k_handle); + + return; +} + +__stdcall static void +ntoskrnl_init_timer_ex(timer, type) + ktimer *timer; + uint32_t type; +{ + if (timer == NULL) + return; + + INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead)); + timer->k_header.dh_sigstate = FALSE; + timer->k_header.dh_type = type; + timer->k_header.dh_size = OTYPE_TIMER; + callout_handle_init(&timer->k_handle); + + return; +} + +__stdcall static void +ntoskrnl_init_dpc(dpc, dpcfunc, dpcctx) + kdpc *dpc; + void *dpcfunc; + void *dpcctx; +{ + if (dpc == NULL) + return; + + dpc->k_deferedfunc = dpcfunc; + dpc->k_deferredctx = dpcctx; + return; } +__stdcall static uint8_t +ntoskrnl_set_timer_ex(timer, duetime, period, dpc) + ktimer *timer; + int64_t duetime; + uint32_t period; + kdpc *dpc; +{ + struct timeval tv; + uint64_t curtime; + uint8_t pending; + + if (timer == NULL) + return(FALSE); + + if (timer->k_handle.callout != NULL && + callout_pending(timer->k_handle.callout)) + pending = TRUE; + else + pending = FALSE; + + timer->k_duetime = duetime; + timer->k_period = period; + timer->k_header.dh_sigstate = FALSE; + timer->k_dpc = dpc; + + if (duetime < 0) { + tv.tv_sec = - (duetime) / 10000000 ; + tv.tv_usec = (- (duetime) / 10) - + (tv.tv_sec * 1000000); + } else { + ntoskrnl_time(&curtime); + tv.tv_sec = ((duetime) - curtime) / 10000000 ; + tv.tv_usec = ((duetime) - curtime) / 10 - + (tv.tv_sec * 1000000); + } + + timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); + + return(pending); +} + +__stdcall static uint8_t +ntoskrnl_set_timer(timer, duetime, dpc) + ktimer *timer; + int64_t duetime; + kdpc *dpc; +{ + return (ntoskrnl_set_timer_ex(timer, duetime, 0, dpc)); +} + +__stdcall static uint8_t +ntoskrnl_cancel_timer(timer) + ktimer *timer; +{ + uint8_t pending; + + if (timer == NULL) + return(FALSE); + + if (timer->k_handle.callout != NULL && + callout_pending(timer->k_handle.callout)) + pending = TRUE; + else + pending = FALSE; + + untimeout(ntoskrnl_timercall, timer, timer->k_handle); + + return(pending); +} + +__stdcall static uint8_t +ntoskrnl_read_timer(timer) + ktimer *timer; +{ + uint8_t pending; + + if (timer == NULL) + return(FALSE); + + if (timer->k_handle.callout != NULL && + callout_pending(timer->k_handle.callout)) + pending = TRUE; + else + pending = FALSE; + + return(pending); +} + __stdcall static void dummy() { @@ -1730,15 +1900,13 @@ { "KeResetEvent", (FUNC)ntoskrnl_reset_event }, { "KeClearEvent", (FUNC)ntoskrnl_clear_event }, { "KeReadStateEvent", (FUNC)ntoskrnl_read_event }, -#ifdef notyet - { "KeInitializeTimer", - { "KeInitializeTimerEx", - { "KeCancelTimer", - { "KeSetTimer", - { "KeSetTimerEx", - { "KeReadStateTimer", - { "KeInitializeDpc", -#endif + { "KeInitializeTimer", (FUNC)ntoskrnl_init_timer }, + { "KeInitializeTimerEx", (FUNC)ntoskrnl_init_timer_ex }, + { "KeInitializeDpc", (FUNC)ntoskrnl_init_dpc }, + { "KeSetTimer", (FUNC)ntoskrnl_set_timer }, + { "KeSetTimerEx", (FUNC)ntoskrnl_set_timer_ex }, + { "KeCancelTimer", (FUNC)ntoskrnl_cancel_timer }, + { "KeReadStateTimer", (FUNC)ntoskrnl_read_timer }, { "ObReferenceObjectByHandle", (FUNC)ntoskrnl_objref }, { "ObfDereferenceObject", (FUNC)ntoskrnl_objderef }, { "ZwClose", (FUNC)ntoskrnl_zwclose }, ==== //depot/projects/netperf_socket/sys/dev/usb/usbdi.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.84 2003/11/09 23:56:19 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.85 2004/03/04 20:49:03 phk Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1117,11 +1117,9 @@ int usbd_ratecheck(struct timeval *last) { -#if 0 - static struct timeval errinterval = { 0, 250000 }; /* 0.25 s*/ - - return (ratecheck(last, &errinterval)); -#endif + if (last->tv_sec == time_second) + return (0); + last->tv_sec = time_second; return (1); } ==== //depot/projects/netperf_socket/sys/modules/ndis/Makefile#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.4 2004/03/03 17:57:05 wpaul Exp $ +# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.5 2004/03/04 23:04:02 wpaul Exp $ .PATH: ${.CURDIR}/../../compat/ndis KMOD= ndis SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h vnode_if.h -SRCS+= opt_ddb.h .include From owner-p4-projects@FreeBSD.ORG Thu Mar 4 16:13:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645C816A4D0; Thu, 4 Mar 2004 16:13:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DFE616A4CE for ; Thu, 4 Mar 2004 16:13:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3763843D41 for ; Thu, 4 Mar 2004 16:13:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i250DrGe081421 for ; Thu, 4 Mar 2004 16:13:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i250Dq25081418 for perforce@freebsd.org; Thu, 4 Mar 2004 16:13:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 Mar 2004 16:13:52 -0800 (PST) Message-Id: <200403050013.i250Dq25081418@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 48169 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, 05 Mar 2004 00:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=48169 Change 48169 by rwatson@rwatson_tislabs on 2004/03/04 16:13:19 Update comment for API change. Affected files ... .. //depot/projects/netperf_socket/sys/sys/mutex.h#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/sys/mutex.h#4 (text+ko) ==== @@ -351,7 +351,7 @@ * * This mechanism is intended as temporary until everything of * importance is properly locked. Note: the semantics for - * NET_{PICKUP,DROP}_GIANT() are not the same as DROP_GIANT() + * NET_{LOCK,UNLOCK}_GIANT() are not the same as DROP_GIANT() * and PICKUP_GIANT(), as they are plain mutex operations * without a recursion counter. */ From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:12:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3A2A16A4D0; Thu, 4 Mar 2004 21:11:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E67B16A4CE for ; Thu, 4 Mar 2004 21:11:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81A5D43D1D for ; Thu, 4 Mar 2004 21:11:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255BxGe059273 for ; Thu, 4 Mar 2004 21:11:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255BxO0059264 for perforce@freebsd.org; Thu, 4 Mar 2004 21:11:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 Mar 2004 21:11:59 -0800 (PST) Message-Id: <200403050511.i255BxO0059264@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 48180 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, 05 Mar 2004 05:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=48180 Change 48180 by rwatson@rwatson_tislabs on 2004/03/04 21:11:49 Integrate the netperf_socket branch to pick up the VM contiguous allocation bug fix from alc. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#3 (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.5 2004/03/03 09:26:40 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.6 2004/03/05 05:08:22 obrien Exp $ # # We don't have modules on amd64. @@ -503,10 +503,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -options PECOFF_SUPPORT -options PECOFF_DEBUG - options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 ==== //depot/projects/netperf_socket/sys/conf/options.amd64#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.11 2004/03/03 09:35:47 obrien Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.12 2004/03/05 04:38:58 obrien Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -15,8 +15,6 @@ COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/netperf_socket/sys/vm/vm_contig.c#4 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.31 2004/03/02 08:25:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.32 2004/03/05 04:46:32 alc Exp $"); #include #include @@ -232,9 +232,7 @@ mtx_lock_spin(&vm_page_queue_free_mtx); for (i = start; i < (start + size / PAGE_SIZE); i++) { pqtype = pga[i].queue - pga[i].pc; - if ((VM_PAGE_TO_PHYS(&pga[i]) != - (VM_PAGE_TO_PHYS(&pga[i - 1]) + PAGE_SIZE)) || - (pqtype != PQ_FREE)) { + if (pqtype != PQ_FREE) { start++; goto again; } From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:38:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1769916A4D0; Thu, 4 Mar 2004 21:38:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2E3B16A4CE for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C996F43D31 for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255cWGe063728 for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255cWaJ063725 for perforce@freebsd.org; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:38:32 -0800 (PST) Message-Id: <200403050538.i255cWaJ063725@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 48182 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, 05 Mar 2004 05:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=48182 Change 48182 by peter@peter_daintree on 2004/03/04 21:37:43 whitespace and gratuitous change sync Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#11 (text+ko) ==== @@ -3,9 +3,7 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# (XXX from i386:NOTES,v 1.1106; merge in updates) -# $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $ -# +# (XXX from i386:NOTES,v 1.1132) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $ # @@ -46,7 +44,7 @@ # # Optional: -device atpic +device atpic # Legacy pic device mptable options NO_MIXED_MODE # Disable use of mixed mode @@ -59,7 +57,7 @@ # deleting the specification for CPUs you don't need to use may make # parts of the system run faster. # -cpu HAMMER +cpu HAMMER # aka K8, aka Opteron & Athlon64 # # Options for CPU features. @@ -69,7 +67,7 @@ # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -#X#options PERFMON +#XXX#options PERFMON ##################################################################### @@ -185,7 +183,7 @@ # is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#X#options TDFX_LINUX # Enable Linuxulator support +#XXX#options TDFX_LINUX # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference @@ -247,8 +245,8 @@ #XXX#device ed #XXX#device lnc -#X#device ath -#X#device ath_hal # Atheros HAL (includes binary component) +#XXX#device ath +#XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer # @@ -259,7 +257,7 @@ # # SCSI host adapters: -# +# # ncv: NCR 53C500 based SCSI host adapters. # nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # stg: TMC 18C30, 18C50 based SCSI host adapters. @@ -300,8 +298,8 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -#X#device cy 1 -#X#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#XXX#device cy 1 +#XXX#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -452,37 +450,37 @@ #XXX these 32 bit binaries is added. # Enable iBCS2 runtime support for SCO and ISC binaries -#X#options IBCS2 +#XXX#options IBCS2 # Emulate spx device for client side of SVR3 local X interface -#X#options SPX_HACK +#XXX#options SPX_HACK # Enable Linux ABI emulation -#X#options COMPAT_LINUX +#XXX#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#X#options LINPROCFS +#XXX#options LINPROCFS # # SysVR4 ABI emulation # # The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a +# a KLD module. +# The STREAMS network emulation code can also be compiled statically or as a # module. If loaded as a module, it must be loaded before the svr4 module # (the /usr/sbin/svr4 script does this for you). If compiling statically, # the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured +# specifies COMPAT_SVR4. It is possible to have a statically-configured # STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 # script understands that it doesn't need to load the `streams' module under # those circumstances. # Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). +# (whether static or dynamic). # -#X#options COMPAT_SVR4 # build emulator statically -#X#options DEBUG_SVR4 # enable verbose debugging -#X#device streams # STREAMS network driver (required for svr4). +#XXX#options COMPAT_SVR4 # build emulator statically +#XXX#options DEBUG_SVR4 # enable verbose debugging +#XXX#device streams # STREAMS network driver (required for svr4). ##################################################################### @@ -501,8 +499,8 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev # PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT # only knows 32 bit file format -#X#options PECOFF_DEBUG +#XXX#options PECOFF_SUPPORT # only knows 32 bit file format +#XXX#options PECOFF_DEBUG options ENABLE_ALART options KBDIO_DEBUG=2 From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:40:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 495BF16A4D0; Thu, 4 Mar 2004 21:40:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D44316A4CE for ; Thu, 4 Mar 2004 21:40:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0936343D1D for ; Thu, 4 Mar 2004 21:40:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255eZGe063843 for ; Thu, 4 Mar 2004 21:40:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255eZTY063840 for perforce@freebsd.org; Thu, 4 Mar 2004 21:40:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:40:35 -0800 (PST) Message-Id: <200403050540.i255eZTY063840@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 48183 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, 05 Mar 2004 05:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=48183 Change 48183 by peter@peter_daintree on 2004/03/04 21:40:24 more whitespace sync Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#12 (text+ko) ==== @@ -182,7 +182,7 @@ # config as well, or you will not have the dependencies. The other option # is to load both as modules. -device tdfx # Enable 3Dfx Voodoo support +device tdfx # Enable 3Dfx Voodoo support #XXX#options TDFX_LINUX # Enable Linuxulator support # @@ -477,7 +477,7 @@ # those circumstances. # Caveat: At this time, `options KTRACE' is required for the svr4 emulator # (whether static or dynamic). -# +# #XXX#options COMPAT_SVR4 # build emulator statically #XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:42:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F3BC16A4CE; Thu, 4 Mar 2004 21:42:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 494D416A4CE for ; Thu, 4 Mar 2004 21:42:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4502743D45 for ; Thu, 4 Mar 2004 21:42:39 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255gdGe065579 for ; Thu, 4 Mar 2004 21:42:39 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255gcZC065576 for perforce@freebsd.org; Thu, 4 Mar 2004 21:42:38 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:42:38 -0800 (PST) Message-Id: <200403050542.i255gcZC065576@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 48184 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, 05 Mar 2004 05:42:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=48184 Change 48184 by peter@peter_daintree on 2004/03/04 21:42:26 fix up some other things obrien found, update comments about atpic/mptable. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#13 (text+ko) ==== @@ -12,8 +12,7 @@ # # This directive is mandatory; it defines the architecture to be -# configured for; in this case, the 386 family based IBM-PC and -# compatibles. +# configured for; in this case, AMD64 family based machines. # machine amd64 @@ -32,8 +31,6 @@ # # Notes: # -# Be sure to disable 'cpu I386_CPU' for SMP kernels. -# # By default, mixed mode is used to route IRQ0 from the AT timer via # the 8259A master PIC through the ExtINT pin on the first I/O APIC. # This can be disabled via the NO_MIXED_MODE option. In that case, @@ -44,8 +41,8 @@ # # Optional: -device atpic # Legacy pic -device mptable +device atpic # Optional legacy pic support +device mptable # Optional MPSPEC mptable support options NO_MIXED_MODE # Disable use of mixed mode From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:44:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C38416A4D0; Thu, 4 Mar 2004 21:44:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 573B516A4CE for ; Thu, 4 Mar 2004 21:44:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 533E243D1D for ; Thu, 4 Mar 2004 21:44:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255igGe065676 for ; Thu, 4 Mar 2004 21:44:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255if4V065673 for perforce@freebsd.org; Thu, 4 Mar 2004 21:44:41 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:44:41 -0800 (PST) Message-Id: <200403050544.i255if4V065673@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 48185 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, 05 Mar 2004 05:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=48185 Change 48185 by peter@peter_daintree on 2004/03/04 21:44:06 disable orphan options. Dont allow config to silently accept options for enabling code that doesn't exist. Its supposed to return an error for these. Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#22 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#22 (text+ko) ==== @@ -10,11 +10,11 @@ # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h -COMPAT_SVR4 opt_dontuse.h -DEBUG_SVR4 opt_svr4.h -NDISAPI opt_dontuse.h +#IBCS2 opt_dontuse.h +#COMPAT_LINUX opt_dontuse.h +#COMPAT_SVR4 opt_dontuse.h +#DEBUG_SVR4 opt_svr4.h +#NDISAPI opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:47:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB50C16A4D0; Thu, 4 Mar 2004 21:47:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A765916A4CE for ; Thu, 4 Mar 2004 21:47:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A37B843D1D for ; Thu, 4 Mar 2004 21:47:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255lkGe065784 for ; Thu, 4 Mar 2004 21:47:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255lk2u065781 for perforce@freebsd.org; Thu, 4 Mar 2004 21:47:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:47:46 -0800 (PST) Message-Id: <200403050547.i255lk2u065781@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 48186 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, 05 Mar 2004 05:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=48186 Change 48186 by peter@peter_daintree on 2004/03/04 21:46:46 add commented out PECOFF placeholders. Although I'm not sure it'll do much good because imgact_pecoff.c is hardcoded for 32 bit Win32 binaries and we're going to need an emulation layer of some sort. In reality, the PECOFF code requires COMPAT_FREEBSD32 because we dont have the header specs for Win64 binaries. Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#23 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#23 (text+ko) ==== @@ -15,6 +15,8 @@ #COMPAT_SVR4 opt_dontuse.h #DEBUG_SVR4 opt_svr4.h #NDISAPI opt_dontuse.h +#PECOFF_DEBUG opt_pecoff.h +#PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:48:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDFD516A4D0; Thu, 4 Mar 2004 21:48:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9925816A4CE for ; Thu, 4 Mar 2004 21:48:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D79343D1F for ; Thu, 4 Mar 2004 21:48:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255mmGe065825 for ; Thu, 4 Mar 2004 21:48:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255mmTo065822 for perforce@freebsd.org; Thu, 4 Mar 2004 21:48:48 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:48:48 -0800 (PST) Message-Id: <200403050548.i255mmTo065822@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 48187 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, 05 Mar 2004 05:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=48187 Change 48187 by peter@peter_daintree on 2004/03/04 21:48:17 remove vesa bogo-options. This cannot exist due to requiring a 32 bit kernel for bios calls and/or VM86. Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#24 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#24 (text+ko) ==== @@ -32,9 +32,6 @@ VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h -VESA -VESA_DEBUG opt_vesa.h - ATKBD_DFLT_KEYMAP opt_atkbd.h # ------------------------------- From owner-p4-projects@FreeBSD.ORG Thu Mar 4 22:00:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3B8116A4D0; Thu, 4 Mar 2004 22:00:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC8C616A4CE for ; Thu, 4 Mar 2004 22:00:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B516C43D45 for ; Thu, 4 Mar 2004 22:00:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i25603Ge067982 for ; Thu, 4 Mar 2004 22:00:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i25602Fi067979 for perforce@freebsd.org; Thu, 4 Mar 2004 22:00:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 22:00:02 -0800 (PST) Message-Id: <200403050600.i25602Fi067979@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 48189 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, 05 Mar 2004 06:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=48189 Change 48189 by peter@peter_daintree on 2004/03/04 21:59:55 IFC @48179 Affected files ... .. //depot/projects/hammer/Makefile.inc1#39 integrate .. //depot/projects/hammer/bin/date/date.c#5 integrate .. //depot/projects/hammer/contrib/diff/diff.h#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#16 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.c#5 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#15 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#57 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#12 integrate .. //depot/projects/hammer/share/man/man4/re.4#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#20 integrate .. //depot/projects/hammer/share/man/man9/Makefile#27 integrate .. //depot/projects/hammer/share/man/man9/ieee80211.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/hammer/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/hammer/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/hammer/sys/conf/options.amd64#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#16 integrate .. //depot/projects/hammer/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#27 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#27 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#7 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#13 integrate .. //depot/projects/hammer/sys/modules/ndis/Makefile#4 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#10 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#7 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#24 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#10 integrate .. //depot/projects/hammer/usr.bin/c99/c99.1#3 integrate .. //depot/projects/hammer/usr.bin/yacc/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.1#3 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#39 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.407 2004/03/03 22:56:41 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.409 2004/03/04 18:41:35 gad Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -221,7 +221,7 @@ @echo @echo "*** Error: path to source tree contains a comma ','" @echo - @false + false .endif @echo @echo "--------------------------------------------------------------" @@ -355,49 +355,50 @@ .if ${TARGET_ARCH} == "sparc64" SPECIAL_INSTALLCHECKS+=sparc64_installcheck -CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}' -SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}' -NEWSPARC_TIMETYPE?=${CUR_TIMETYPE} -THISHOST!= hostname -s -.if ${THISHOST} == "" +CUR_TIMET!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}' +SRC_TIMET!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \ + awk '{print $$2}' +NEWSPARC_TIMETYPE?=${CUR_TIMET} +THISHOST!= hostname -s +.if empty(THISHOST) THISHOST="name not set yet" .endif sparc64_installcheck: -.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE} - @echo "" -.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} - @echo "*** ERROR: This target would change the type used for time_t! ***" +.if ${CUR_TIMET} != ${SRC_TIMET} + @echo +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} + @echo "*** ERROR: This target would change the type used for time_t!" .else - @echo "* Note: This installation changes the type used for time_t" + @echo "* Note: This installation changes the type used for time_t." .endif @echo "* " - @echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE}," - @echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}." -.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} + @echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMET}," + @echo "* and this installation will switch time_t to be type ${SRC_TIMET}." +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} @echo "* " @echo "* If that is *NOT* what you wanted, then you need to change the" - @echo "* typedef for __time_t in: ${.CURDIR}/sys/sparc64/include/_types.h" - @echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'. After that you *MUST* do a" - @echo "* complete cleanworld, buildworld, buildkernel before you retry" - @echo "* your 'make' command. Also read /usr/src/UPDATING.64BTT." + @echo "* typedef of __time_t in ${.CURDIR}/sys/sparc64/include/_types.h" + @echo "* from '${SRC_TIMET}' to '${CUR_TIMET}'. After that you *MUST*" + @echo "* do a complete cleanworld, buildworld, buildkernel before you" + @echo "* retry the 'make' command. Also read /usr/src/UPDATING.64BTT." @echo "* " @echo "* If that *is* what you want, then enter the commands:" - @echo " NEWSPARC_TIMETYPE=${SRC_TIMETYPE}" + @echo " NEWSPARC_TIMETYPE=${SRC_TIMET}" @echo " export NEWSPARC_TIMETYPE" @echo "* and repeat your 'make' command." - @echo "" - @false + @echo + false .endif - @echo "" -.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE} - @echo "" - @echo "*** ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'" + @echo +.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} + @echo + @echo "*** ERROR: NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'" @echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h" - @echo "*** has __time_t defined as: '${SRC_TIMETYPE}'" - @false + @echo "*** has __time_t defined as '${SRC_TIMET}'." + false .else - @# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}' + @# in sparc64_installcheck, all TIMETYPEs == '${CUR_TIMET}' .endif .endif @@ -508,7 +509,7 @@ buildkernel: .if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; - @false + false .endif .if defined(KERNWARN) @echo "--------------------------------------------------------------" @@ -558,7 +559,7 @@ .endfor # -# installkernel +# installkernel, etc. # # Install the kernel defined by INSTALLKERNEL # @@ -566,7 +567,7 @@ reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install." - @false + false .endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ==== //depot/projects/hammer/bin/date/date.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.44 2003/10/04 07:16:40 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.45 2004/03/04 15:46:14 mtm Exp $"); #include #include @@ -234,9 +234,9 @@ case 10: /* yy */ if (century) lt->tm_year += ATOI2(p); - else { /* hack for 2000 ;-} */ + else { lt->tm_year = ATOI2(p); - if (lt->tm_year < 69) + if (lt->tm_year < 69) /* hack for 2000 ;-} */ lt->tm_year += 2000 - TM_YEAR_BASE; else lt->tm_year += 1900 - TM_YEAR_BASE; ==== //depot/projects/hammer/contrib/diff/diff.h#4 (text+ko) ==== @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with GNU DIFF; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/contrib/diff/diff.h,v 1.3 2004/02/16 22:54:45 ache Exp $ */ #include "system.h" #include ==== //depot/projects/hammer/etc/rc.d/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.31 2004/02/07 15:46:20 imp Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.32 2004/03/04 21:03:36 bms Exp $ .include @@ -14,6 +14,7 @@ fsck \ gbde gbde_swap \ hostname \ + ike \ inetd initdiskless initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ ==== //depot/projects/hammer/gnu/lib/libregex/regex.c#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.11 2004/02/25 02:39:10 ache Exp $ */ /* Extended regular expression matching and search library, version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the ==== //depot/projects/hammer/gnu/lib/libregex/regex.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/gnu/lib/libregex/regex.h,v 1.5 2004/02/25 02:39:10 ache Exp $ */ #ifndef _REGEX_H #include ==== //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.33 2004/02/24 19:23:28 johan Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.34 2004/03/04 20:36:18 ache Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -24,6 +24,8 @@ .endif CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH} +# to pick right getopt.h +CFLAGS+= -I${DESTDIR}/usr/include CFLAGS+= -I${SRCDIR}/include .if exists(${.CURDIR}/${TARGET_ARCH}) ==== //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#5 (text+ko) ==== @@ -1,4 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.15 2004/02/24 19:23:29 johan Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.16 2004/03/05 01:47:02 ache Exp $ + +# must be before -I${DESTDIR}/usr/include +CFLAGS+= -I${DESTDIR}/usr/include/gnu .include "../Makefile.inc0" @@ -10,7 +13,6 @@ CFLAGS+= -DBFD_ASSEMBLER CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${DESTDIR}/usr/include/gnu CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config DPADD= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} ==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#8 (text+ko) ==== @@ -1,5 +1,8 @@ # ex:ts=8 -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.76 2004/02/24 19:23:29 johan Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.77 2004/03/05 01:47:03 ache Exp $ + +# must be before -I${DESTDIR}/usr/include +CFLAGS+= -I${DESTDIR}/usr/include/gnu .include "../Makefile.inc0" @@ -58,7 +61,6 @@ CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config -CFLAGS+= -I${DESTDIR}/usr/include/gnu CFLAGS+= -I$(.CURDIR) YFLAGS= ==== //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#4 (text+ko) ==== @@ -18,6 +18,8 @@ /* Written June, 1988 by Mike Haertel Modified July, 1988 by Arthur David Olson to assist BMG speedups */ +/* $FreeBSD: src/gnu/usr.bin/grep/dfa.c,v 1.14 2004/03/01 08:37:20 ache Exp $ */ + #ifdef HAVE_CONFIG_H #include #endif ==== //depot/projects/hammer/gnu/usr.bin/grep/search.c#4 (text+ko) ==== @@ -18,6 +18,8 @@ /* Written August 1992 by Mike Haertel. */ +/* $FreeBSD: src/gnu/usr.bin/grep/search.c,v 1.12 2004/03/01 08:37:20 ache Exp $ */ + #ifdef HAVE_CONFIG_H # include #endif ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.1 2004/02/09 23:22:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.2 2004/03/05 00:09:53 kientzle Exp $"); #include #ifdef DMALLOC @@ -701,6 +701,8 @@ tar_atol10(value, strlen(value))); else if (strcmp(key, "SCHILY.fflags")==0) archive_entry_set_fflags(entry, value); + else if (strcmp(key, "SCHILY.nlink")==0) + st->st_nlink = tar_atol10(value, strlen(value)); break; case 'a': if (strcmp(key, "atime")==0) ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#15 (text+ko) ==== @@ -42,7 +42,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.64 2004/02/28 22:49:15 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.66 2004/03/05 04:19:06 bmah Exp $ 2000 @@ -146,7 +146,7 @@ option, which uses &man.mksnap.ffs.8;. Note that &man.mksnap.ffs.8; is normally only available to the superuser and members of the operator - group. This bug has been fixed on the &os; &release.current; + group. This bug has been fixed on the &os; &release.prev; security fix branch and in &os; &release.bugfix;. For more information, see security advisory FreeBSD-SA-04:01. @@ -157,7 +157,7 @@ attacker to gain unauthorized access to parts of kernel memory, possibly resulting in disclosure of sensitive information, bypass of access control mechanisms, or privilege escalation. - This bug has been fixed on the &os; &release.current; + This bug has been fixed on the &os; &release.prev; security fix branch and in &os; &release.bugfix;. More details, including bugfix and workaround information, can be found in security advisory FreeBSD-SA-04:03. + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.jail.asc">FreeBSD-SA-04:03. + + (4 Mar 2004) It is possible for a remote attacker to conduct + a low-bandwidth denial-of-service attack against a machine + providing TCP-based services, filling up the target's memory + buffers and potentially leading to a system crash. This + vulnerability has been addressed on the &os; &release.prev; + security fix branch, but is present in both &os; &release.prev; + and &release.bugfix;. Security advisory FreeBSD-SA-04:04 + contains more details, as well as information on patching + existing systems. ]]> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#57 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.685 2004/02/29 02:20:21 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.686 2004/03/04 17:06:30 bmah Exp $ 2000 @@ -148,6 +148,13 @@ jail. More information can be found in security advisory FreeBSD-SA-04:03. + A potential low-bandwidth denial-of-service attack against + the &os; TCP stack has been prevented by limiting the number of + out-of-sequence TCP segments that can be held at one time. More + details can be found in security advisory FreeBSD-SA-04:04. + &merged; + @@ -289,13 +296,6 @@ support for the TCP-MD5 class of security associations. &merged; - The TCP segment reassembly queue now uses the UMA kernel - memory allocator and limits the maximum number of segments it - will hold, thus preventing a certain class of denial of - service attack. Its behavior is controlled by the - net.inet.tcp.reass hierarchy of sysctl - variables. - ==== //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#12 (text+ko) ==== @@ -1,8 +1,8 @@